diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-04 00:20:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-04 00:20:48 -0800 |
| commit | cb6020bb017405cc3e7f1faea6f30d4fd1b62e70 (patch) | |
| tree | e03a7afb1884d2b4f8f1e45ee6a945baebd95806 /Documentation/git-merge.txt | |
| parent | 1a56be134f9477296a7ade040e8b802bf3a643a1 (diff) | |
| download | git-cb6020bb017405cc3e7f1faea6f30d4fd1b62e70.tar.gz | |
Teach --[no-]rerere-autoupdate option to merge, revert and friends
Introduce a command line option to override rerere.autoupdate configuration
variable to make it more useful.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
| -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> |