diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 02:13:40 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:02:05 -0700 |
| commit | fdc4408a8980392f2cc30dc125906a61edf170ec (patch) | |
| tree | 0ae3d9dd3f1e63887a2b5847e71cb3b4f7627a8a | |
| parent | c2c9a87d4f5a643ef93db7c39fc01c4965bf67a3 (diff) | |
| download | git-fdc4408a8980392f2cc30dc125906a61edf170ec.tar.gz | |
merge script: learn --[no-]rerere-autoupdate
Port v1.7.0-rc0~83^2 (Teach --[no-]rerere-autoupdate option to
merge, revert and friends, 2009-12-04) to the example merge script.
After this change, all tests pass for me with the scripted
merge.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | contrib/examples/git-merge.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh index bed55a48df..7b922c3948 100755 --- a/contrib/examples/git-merge.sh +++ b/contrib/examples/git-merge.sh @@ -16,6 +16,7 @@ squash create a single commit instead of doing a merge commit perform a commit if the merge succeeds (default) ff allow fast-forward (default) ff-only abort if fast-forward is not possible +rerere-autoupdate update index with any reused conflict resolution s,strategy= merge strategy to use X= option for selected merge strategy m,message= message to be used for the merge commit (if any) @@ -48,7 +49,7 @@ xopt= allow_fast_forward=t fast_forward_only= allow_trivial_merge=t -squash= no_commit= log_arg= +squash= no_commit= log_arg= rr_arg= dropsave() { rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \ @@ -200,6 +201,8 @@ parse_config () { test "$allow_fast_forward" != f || die "You cannot combine --ff-only with --no-ff." fast_forward_only=t ;; + --rerere-autoupdate|--no-rerere-autoupdate) + rr_arg=$1 ;; -s|--strategy) shift case " $all_strategies " in @@ -612,6 +615,6 @@ Conflicts: sed -e 's/^[^ ]* / /' | uniq } >>"$GIT_DIR/MERGE_MSG" - git rerere + git rerere $rr_arg die "Automatic merge failed; fix conflicts and then commit the result." fi |