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-am.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-am.sh')
| -rwxr-xr-x | git-am.sh | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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 |