summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-18 18:13:01 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-18 18:13:01 -0800
commit4a88fb7ffc32bdfdfab2605430514d92aba25b8a (patch)
tree77d37de207313b760eb08c502be1ea98a18351e9 /Documentation
parent26b9f5cc99a35d4f678c2f565e48237fc9515444 (diff)
parentcb6020bb017405cc3e7f1faea6f30d4fd1b62e70 (diff)
downloadgit-4a88fb7ffc32bdfdfab2605430514d92aba25b8a.tar.gz
Merge branch 'jc/rerere'
* jc/rerere: Teach --[no-]rerere-autoupdate option to merge, revert and friends
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-merge.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index e886c2ef54..67470311e2 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -10,7 +10,7 @@ SYNOPSIS
--------
[verse]
'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
- [-m <msg>] <remote>...
+ [--[no-]rerere-autoupdate] [-m <msg>] <remote>...
'git merge' <msg> HEAD <remote>...
DESCRIPTION
@@ -33,6 +33,11 @@ include::merge-options.txt[]
used to give a good default for automated 'git merge'
invocations.
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+ Allow the rerere mechanism to update the index with the
+ result of auto-conflict resolution if possible.
+
<remote>...::
Other branch heads to merge into our branch. You need at
least one <remote>. Specifying more than one <remote>