Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
ls-tree: --name-only
[gitweb.git]
/
git-applymbox.sh
diff --git
a/git-applymbox.sh
b/git-applymbox.sh
index 24d4a8cb4eb95a5201c205be879d3ac6a62a8a15..c686cc8d27a64998c141cca2989375910601f90f 100755
(executable)
--- a/
git-applymbox.sh
+++ b/
git-applymbox.sh
@@
-33,7
+33,7
@@
do
-k) keep_subject=-k ;;
-q) query_apply=t ;;
-c) continue="$2"; resume=f; shift ;;
- -m) fallback_3way=t ;;
+ -m) fall
_
back_3way=t ;;
-*) usage ;;
*) break ;;
esac