summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorPhillip Wood <phillip.wood@dunelm.org.uk>2019-03-14 19:12:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-03-18 01:24:58 (GMT)
commit15c6dbd877b0df7d52ec23fb9e0004c3baf841e9 (patch)
treec9a78258e4a6ef548be95ba010800deeccbb6dd8 /Documentation/git-merge.txt
parentaba4954cb05fa60bc00ada3bdfcbe6d72d9b8380 (diff)
downloadgit-15c6dbd877b0df7d52ec23fb9e0004c3baf841e9.zip
git-15c6dbd877b0df7d52ec23fb9e0004c3baf841e9.tar.gz
git-15c6dbd877b0df7d52ec23fb9e0004c3baf841e9.tar.bz2
merge: tweak --rerere-autoupdate documentation
Spell out --no-rerere-autoupdate explictly to make searching easier. This matches the other --no options in the man page. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 4cc8646..6294dbc 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -83,7 +83,8 @@ invocations. The automated message can include the branch description.
If `--log` is specified, a shortlog of the commits being merged
will be appended to the specified message.
---[no-]rerere-autoupdate::
+--rerere-autoupdate::
+--no-rerere-autoupdate::
Allow the rerere mechanism to update the index with the
result of auto-conflict resolution if possible.