projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work around missing hard links on FAT formatted media
[git.git]
/
git-am.sh
diff --git
a/git-am.sh
b/git-am.sh
index
fd0772d
..
115ebad
100755
(executable)
--- a/
git-am.sh
+++ b/
git-am.sh
@@
-270,14
+270,17
@@
do
echo "--------------------------"
cat "$dotest/final-commit"
echo "--------------------------"
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
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 ;;
action=again ;;
+ [vV]*) action=again
+ LESS=-S ${PAGER:-less} "$dotest/patch" ;;
+ *) action=again ;;
esac
done
else
esac
done
else