diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-12-02 23:01:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-02 23:01:02 -0800 |
| commit | ac4d528ec18ae13a45166ef2afa9ffbba35f736f (patch) | |
| tree | b81f3cd367b2beeae8d1a7298f0b6fea6102764b | |
| parent | Merge branch 'js/pull-rebase' (diff) | |
| parent | rebase -i: give rerere a chance (diff) | |
| download | tgif-ac4d528ec18ae13a45166ef2afa9ffbba35f736f.tar.xz | |
Merge branch 'js/rebase-i-rerere'
* js/rebase-i-rerere:
rebase -i: give rerere a chance
| -rwxr-xr-x | git-rebase--interactive.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index beeefec0e4..f83e00fe8f 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -95,6 +95,7 @@ make_patch () { die_with_patch () { make_patch "$1" + git rerere die "$2" } @@ -180,13 +181,13 @@ pick_one_preserving_merges () { msg="$(git cat-file commit $sha1 | sed -e '1,/^$/d')" # No point in merging the first parent, that's HEAD new_parents=${new_parents# $first_parent} - # NEEDSWORK: give rerere a chance if ! GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \ GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \ GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \ output git merge $STRATEGY -m "$msg" \ $new_parents then + git rerere printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG die Error redoing merge $sha1 fi @@ -374,6 +375,7 @@ do --abort) comment_for_reflog abort + git rerere clear test -d "$DOTEST" || die "No interactive rebase running" HEADNAME=$(cat "$DOTEST"/head-name) @@ -390,6 +392,7 @@ do --skip) comment_for_reflog skip + git rerere clear test -d "$DOTEST" || die "No interactive rebase running" output git reset --hard && do_rest |