projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fcd4240) | patch
Docs: Add -X option to git-merge's synopsis.
authorMarc Branchaud <marcnarc@xiplink.com>
Mon, 12 Apr 2010 16:28:13 +0000 (12:28 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Apr 2010 16:50:09 +0000 (09:50 -0700)
commitadda3c3beb0a244719becb1895e16227b0393bd1
tree44b3268ee1379eddabd91fae67c1e71377659faetree | snapshot
parentfcd424011bf7b841e9d4b3154ecadf6bf5e6e686commit | 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>
Documentation/git-merge.txt diff | blob | history
Documentation/merge-options.txt diff | blob | history
Git—the stupid content tracker