projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
format-patch: remove applies-to.
[git.git]
/
git-applymbox.sh
diff --git
a/git-applymbox.sh
b/git-applymbox.sh
index
6de6932
..
c686cc8
100755
(executable)
--- a/
git-applymbox.sh
+++ b/
git-applymbox.sh
@@
-18,7
+18,7
@@
##
## git-am is supposed to be the newer and better tool for this job.
##
## git-am is supposed to be the newer and better tool for this job.
-. git-sh-setup
|| die "Not a git archive"
+. git-sh-setup
usage () {
echo >&2 "applymbox [-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]"
usage () {
echo >&2 "applymbox [-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]"
@@
-33,7
+33,7
@@
do
-k) keep_subject=-k ;;
-q) query_apply=t ;;
-c) continue="$2"; resume=f; shift ;;
-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
-*) usage ;;
*) break ;;
esac