@matheusbsbs / matheus-bagliano / commits / 8ef1c7c77d
Fork 0

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>

Shawn Pearce committed Jul 14, 2006 at 00:47 UTC 8ef1c7c77d3e5950a839d9ae348827fa288a9a11
2 files changed +11 -4
git-am.sh
+5 -1
@@ -91,6 +91,7 @@ fall_back_3way () {
91 }
92
93 prec=4
94 +rloga=am
95 dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary= ws= resolvemsg=
96
97 while case "$#" in 0) break;; esac
@@ -130,6 +131,9 @@ do
131 --resolvemsg=*)
132 resolvemsg=$(echo "$1" | sed -e "s/^--resolvemsg=//"); shift ;;
133
134 + --reflog-action=*)
135 + rloga=`expr "z$1" : 'z-[^=]*=\(.*\)'`; shift ;;
136 +
137 --)
138 shift; break ;;
139 -*)
@@ -413,7 +417,7 @@ do
417 parent=$(git-rev-parse --verify HEAD) &&
418 commit=$(git-commit-tree $tree -p $parent <"$dotest/final-commit") &&
419 echo Committed: $commit &&
416 - git-update-ref -m "am: $SUBJECT" HEAD $commit $parent ||
420 + git-update-ref -m "$rloga: $SUBJECT" HEAD $commit $parent ||
421 stop_here $this
422
423 if test -x "$GIT_DIR"/hooks/post-applypatch
git-rebase.sh
+6 -3
@@ -131,7 +131,8 @@ do
131 finish_rb_merge
132 exit
133 fi
134 - git am --resolved --3way --resolvemsg="$RESOLVEMSG"
134 + git am --resolved --3way --resolvemsg="$RESOLVEMSG" \
135 + --reflog-action=rebase
136 exit
137 ;;
138 --skip)
@@ -150,7 +151,8 @@ do
151 finish_rb_merge
152 exit
153 fi
153 - git am -3 --skip --resolvemsg="$RESOLVEMSG"
154 + git am -3 --skip --resolvemsg="$RESOLVEMSG" \
155 + --reflog-action=rebase
156 exit
157 ;;
158 --abort)
@@ -288,7 +290,8 @@ fi
290 if test -z "$do_merge"
291 then
292 git-format-patch -k --stdout --full-index "$upstream"..ORIG_HEAD |
291 - git am --binary -3 -k --resolvemsg="$RESOLVEMSG"
293 + git am --binary -3 -k --resolvemsg="$RESOLVEMSG" \
294 + --reflog-action=rebase
295 exit $?
296 fi
297