Mark gitd arguments as optional.
Changed current directory from w to a script using $PWD, because the former is buggy.
Fix issue with behind/ahead remote symbols.
Represent merging with x.