undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Record rebase changes as 'rebase' in the reflog.

Browse Source 
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Shawn Pearce 2006-07-14 00:47:23 -04:00 committed by Junio C Hamano
parent 5a6852fef1
commit 8ef1c7c77d
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-am.sh
View File

@ -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

9
git-rebase.sh
View File

@ -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