From adda3c3beb0a244719becb1895e16227b0393bd1 Mon Sep 17 00:00:00 2001 From: Marc Branchaud Date: Mon, 12 Apr 2010 12:28:13 -0400 Subject: 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 --- Documentation/merge-options.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Documentation/merge-options.txt') diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 3b83dba1a0..81ac823964 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -62,6 +62,11 @@ option can be used to override --squash. is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise). +-X