diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-18 18:13:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-18 18:13:01 -0800 |
| commit | 4a88fb7ffc32bdfdfab2605430514d92aba25b8a (patch) | |
| tree | 77d37de207313b760eb08c502be1ea98a18351e9 /Documentation | |
| parent | Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches' (diff) | |
| parent | Teach --[no-]rerere-autoupdate option to merge, revert and friends (diff) | |
| download | tgif-4a88fb7ffc32bdfdfab2605430514d92aba25b8a.tar.xz | |
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.txt | 7 |
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> |