summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorShawn Pearce <spearce@spearce.org>2006-07-14 04:47:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-14 06:08:24 (GMT)
commit8ef1c7c77d3e5950a839d9ae348827fa288a9a11 (patch)
tree60146e0b15c491171c16bbc216476507986b367f /git-rebase.sh
parent5a6852fef1d76369d6dfcad1a40ca5287bb781a6 (diff)
downloadgit-8ef1c7c77d3e5950a839d9ae348827fa288a9a11.zip
git-8ef1c7c77d3e5950a839d9ae348827fa288a9a11.tar.gz
git-8ef1c7c77d3e5950a839d9ae348827fa288a9a11.tar.bz2
Record rebase changes as 'rebase' in the reflog.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 1b9e986..29028dd 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