summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-16 17:04:05 -0700
committerJunio C Hamano <gitster@pobox.com>2008-04-16 17:04:05 -0700
commitd0ab520a2599afdfd4d61894863984fc36842b12 (patch)
treec80fb4883d6e608e112438e54106b983af4c70fa /git-am.sh
parent464509f790f409d95e0820364ef7296d82942d8c (diff)
parent11dc4e70c33c2fbbff19014035d3bf624da1902c (diff)
downloadgit-d0ab520a2599afdfd4d61894863984fc36842b12.tar.gz
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4: git-am: minor cleanup Clarify and fix English in "git-rm" documentation
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/git-am.sh b/git-am.sh
index 245e1db1fc..646dc45b8d 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -383,7 +383,6 @@ do
;;
esac
esac
- FIRSTLINE=$(head -1 "$dotest/final-commit")
resume=
if test "$interactive" = t
@@ -404,7 +403,6 @@ do
[aA]*) action=yes interactive= ;;
[nN]*) action=skip ;;
[eE]*) git_editor "$dotest/final-commit"
- FIRSTLINE=$(head -1 "$dotest/final-commit")
action=again ;;
[vV]*) action=again
LESS=-S ${PAGER:-less} "$dotest/patch" ;;
@@ -414,6 +412,7 @@ do
else
action=yes
fi
+ FIRSTLINE=$(head -1 "$dotest/final-commit")
if test $action = skip
then