summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-10-01 07:27:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-10-01 07:27:51 (GMT)
commit076d7aa5d406fea1a5dedff5e2c54e2716528222 (patch)
tree9abd862eaa1242acbb1c66a12f52fa7d16d47f06 /git-am.sh
parent1f088191015968436e7cc6423827b0c26f3427ea (diff)
downloadgit-076d7aa5d406fea1a5dedff5e2c54e2716528222.zip
git-076d7aa5d406fea1a5dedff5e2c54e2716528222.tar.gz
git-076d7aa5d406fea1a5dedff5e2c54e2716528222.tar.bz2
git-am: fix typo in the previous one.
Caught on #git by Ulrik Sverdrup Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 77a0e20..cfa6fcf 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -453,7 +453,7 @@ do
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