summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 271440e)
raw | patch | inline | side by side (parent: 271440e)
author | Junio C Hamano <junkio@cox.net> | |
Wed, 26 Oct 2005 06:43:59 +0000 (23:43 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 26 Oct 2005 06:43:59 +0000 (23:43 -0700) |
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-am.sh | patch | blob | history |
diff --git a/git-am.sh b/git-am.sh
index fd0772d900211557200c542b882ead04842f6628..115ebaddf595f49059208ac890308b6ebe01aa42 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
echo "--------------------------"
cat "$dotest/final-commit"
echo "--------------------------"
- echo -n "Apply? [y]es/[n]o/[e]dit/[a]ccept all "
+ echo -n "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
read reply
case "$reply" in
- y*|Y*) action=yes ;;
- a*|A*) action=yes interactive= ;;
- n*|N*) action=skip ;;
- e*|E*) "${VISUAL:-${EDITOR:-vi}}" "$dotest/final-commit"
+ [yY]*) action=yes ;;
+ [aA]*) action=yes interactive= ;;
+ [nN]*) action=skip ;;
+ [eE]*) "${VISUAL:-${EDITOR:-vi}}" "$dotest/final-commit"
action=again ;;
+ [vV]*) action=again
+ LESS=-S ${PAGER:-less} "$dotest/patch" ;;
+ *) action=again ;;
esac
done
else