summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1f08819)
raw | patch | inline | side by side (parent: 1f08819)
author | Junio C Hamano <gitster@pobox.com> | |
Mon, 1 Oct 2007 07:27:51 +0000 (00:27 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 1 Oct 2007 07:27:51 +0000 (00:27 -0700) |
Caught on #git by Ulrik Sverdrup
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-am.sh | patch | blob | history |
diff --git a/git-am.sh b/git-am.sh
index 77a0e20996a3f1a945485135791fd24596f8af60..cfa6fcf0af01e6b6c9e3a3a909d88b500aa25365 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
parent=$(git rev-parse --verify HEAD) &&
commit=$(git commit-tree $tree -p $parent <"$dotest/final-commit") &&
git update-ref -m "$GIT_REFLOG_ACTION: $SUBJECT" HEAD $commit $parent ||
- stop_here $thisy
+ stop_here $this
if test -x "$GIT_DIR"/hooks/post-applypatch
then