![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Branchaud <marcnarc@xiplink.com> | |
| Mon, 12 Apr 2010 16:28:13 +0000 (12:28 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 12 Apr 2010 16:50:09 +0000 (09:50 -0700) | ||
| commit | adda3c3beb0a244719becb1895e16227b0393bd1 | |
| tree | 44b3268ee1379eddabd91fae67c1e71377659fae | tree | snapshot |
| parent | fcd424011bf7b841e9d4b3154ecadf6bf5e6e686 | commit | diff |
Docs: Add -X option to git-merge's synopsis.
Also move -X's description next to -s's in merge-options.txt.
This makes it easier to learn how to specify merge strategy options.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Also move -X's description next to -s's in merge-options.txt.
This makes it easier to learn how to specify merge strategy options.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-merge.txt | diff | blob | history | |
| Documentation/merge-options.txt | diff | blob | history |