projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-svn: --branch-all-refs / -B support
[git.git]
/
git-applymbox.sh
diff --git
a/git-applymbox.sh
b/git-applymbox.sh
index
24d4a8c
..
5569fdc
100755
(executable)
--- a/
git-applymbox.sh
+++ b/
git-applymbox.sh
@@
-18,12
+18,10
@@
##
## 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.
+USAGE='[-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]'
. git-sh-setup
. git-sh-setup
-usage () {
- echo >&2 "applymbox [-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]"
- exit 1
-}
+git var GIT_COMMITTER_IDENT >/dev/null || exit
keep_subject= query_apply= continue= utf8= resume=t
while case "$#" in 0) break ;; esac
keep_subject= query_apply= continue= utf8= resume=t
while case "$#" in 0) break ;; esac
@@
-33,7
+31,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