Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
merge: tweak --rerere-autoupdate documentation
author
Phillip Wood
<phillip.wood@dunelm.org.uk>
Thu, 14 Mar 2019 19:12:33 +0000
(19:12 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 18 Mar 2019 01:24:58 +0000
(10:24 +0900)
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>
Documentation/git-merge.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
aba4954
)
diff --git
a/Documentation/git-merge.txt
b/Documentation/git-merge.txt
index 4cc86469f3dd45564b40b327d1b39f2bb213bb98..6294dbc09d213815fb3a31328de87af52fcf606a 100644
(file)
--- 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.