summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorShawn Pearce <spearce@spearce.org>2006-07-14 00:47:23 -0400
committerJunio C Hamano <junkio@cox.net>2006-07-13 23:08:24 -0700
commit8ef1c7c77d3e5950a839d9ae348827fa288a9a11 (patch)
tree60146e0b15c491171c16bbc216476507986b367f /git-am.sh
parent5a6852fef1d76369d6dfcad1a40ca5287bb781a6 (diff)
downloadgit-8ef1c7c77d3e5950a839d9ae348827fa288a9a11.tar.gz
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-am.sh')
-rwxr-xr-xgit-am.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index db9a20a811..3a129e0021 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -91,6 +91,7 @@ fall_back_3way () {
}
prec=4
+rloga=am
dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary= ws= resolvemsg=
while case "$#" in 0) break;; esac
@@ -130,6 +131,9 @@ do
--resolvemsg=*)
resolvemsg=$(echo "$1" | sed -e "s/^--resolvemsg=//"); shift ;;
+ --reflog-action=*)
+ rloga=`expr "z$1" : 'z-[^=]*=\(.*\)'`; shift ;;
+
--)
shift; break ;;
-*)
@@ -413,7 +417,7 @@ do
parent=$(git-rev-parse --verify HEAD) &&
commit=$(git-commit-tree $tree -p $parent <"$dotest/final-commit") &&
echo Committed: $commit &&
- git-update-ref -m "am: $SUBJECT" HEAD $commit $parent ||
+ git-update-ref -m "$rloga: $SUBJECT" HEAD $commit $parent ||
stop_here $this
if test -x "$GIT_DIR"/hooks/post-applypatch