зеркало из https://github.com/microsoft/git.git
git-am: Usage string clean-up
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Родитель
4e7824b12e
Коммит
cf1fe88ce1
10
git-am.sh
10
git-am.sh
|
@ -1,14 +1,10 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
. git-sh-setup
|
|
||||||
|
|
||||||
usage () {
|
USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>
|
||||||
echo >&2 "usage: $0 [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>"
|
or, when resuming [--skip | --resolved]'
|
||||||
echo >&2 " or, when resuming"
|
. git-sh-setup
|
||||||
echo >&2 " $0 [--skip | --resolved]"
|
|
||||||
exit 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
stop_here () {
|
stop_here () {
|
||||||
echo "$1" >"$dotest/next"
|
echo "$1" >"$dotest/next"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче