diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-07-17 01:08:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-17 01:08:11 -0700 |
| commit | b9718d41c7e9c171e432bafac97a33be36f0e2bf (patch) | |
| tree | 22f2ceb1019de1fa335e4f31f5fa61f84b231f13 /git-rebase.sh | |
| parent | git-svn: don't check for migrations/upgrades on commit-diff (diff) | |
| parent | Record rebase changes as 'rebase' in the reflog. (diff) | |
| download | tgif-b9718d41c7e9c171e432bafac97a33be36f0e2bf.tar.xz | |
Merge branch 'sp/reflog'
* sp/reflog:
Record rebase changes as 'rebase' in the reflog.
Log ref changes made by resolve.
Log ref changes made by quiltimport.
Log ref changes made by git-merge and git-pull.
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 1b9e986926..29028dd5fc 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -131,7 +131,8 @@ do finish_rb_merge exit fi - git am --resolved --3way --resolvemsg="$RESOLVEMSG" + git am --resolved --3way --resolvemsg="$RESOLVEMSG" \ + --reflog-action=rebase exit ;; --skip) @@ -150,7 +151,8 @@ do finish_rb_merge exit fi - git am -3 --skip --resolvemsg="$RESOLVEMSG" + git am -3 --skip --resolvemsg="$RESOLVEMSG" \ + --reflog-action=rebase exit ;; --abort) @@ -288,7 +290,8 @@ fi if test -z "$do_merge" then git-format-patch -k --stdout --full-index "$upstream"..ORIG_HEAD | - git am --binary -3 -k --resolvemsg="$RESOLVEMSG" + git am --binary -3 -k --resolvemsg="$RESOLVEMSG" \ + --reflog-action=rebase exit $? fi |