Trivial 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:
parent
aa9dc7afd2
commit
806f36d4d7
13
git-add.sh
13
git-add.sh
@ -1,13 +1,8 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
die () {
|
USAGE='[-n] [-v] <file>...'
|
||||||
echo >&2 "$*"
|
SUBDIRECTORY_OK='Yes'
|
||||||
exit 1
|
. git-sh-setup
|
||||||
}
|
|
||||||
|
|
||||||
usage() {
|
|
||||||
die "usage: git add [-n] [-v] <file>..."
|
|
||||||
}
|
|
||||||
|
|
||||||
show_only=
|
show_only=
|
||||||
verbose=
|
verbose=
|
||||||
@ -29,8 +24,6 @@ while : ; do
|
|||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
GIT_DIR=$(git-rev-parse --git-dir) || exit
|
|
||||||
|
|
||||||
if test -f "$GIT_DIR/info/exclude"
|
if test -f "$GIT_DIR/info/exclude"
|
||||||
then
|
then
|
||||||
git-ls-files -z \
|
git-ls-files -z \
|
||||||
|
@ -18,13 +18,9 @@
|
|||||||
##
|
##
|
||||||
## 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
|
|
||||||
}
|
|
||||||
|
|
||||||
keep_subject= query_apply= continue= utf8= resume=t
|
keep_subject= query_apply= continue= utf8= resume=t
|
||||||
while case "$#" in 0) break ;; esac
|
while case "$#" in 0) break ;; esac
|
||||||
do
|
do
|
||||||
|
@ -1,9 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
. git-sh-setup
|
|
||||||
|
|
||||||
usage () {
|
USAGE='[-f] [-b <new_branch>] [<branch>] [<paths>...]'
|
||||||
die "usage: git checkout [-f] [-b <new_branch>] [<branch>] [<paths>...]"
|
. git-sh-setup
|
||||||
}
|
|
||||||
|
|
||||||
old=$(git-rev-parse HEAD)
|
old=$(git-rev-parse HEAD)
|
||||||
new=
|
new=
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
unset CDPATH
|
unset CDPATH
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo >&2 "* git clone [-l [-s]] [-q] [-u <upload-pack>] [-n] <repo> [<dir>]"
|
echo >&2 "Usage: $0 [-l [-s]] [-q] [-u <upload-pack>] [-n] <repo> [<dir>]"
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,12 +3,9 @@
|
|||||||
# Copyright (c) 2005 Linus Torvalds
|
# Copyright (c) 2005 Linus Torvalds
|
||||||
#
|
#
|
||||||
|
|
||||||
|
USAGE='[-a] [-s] [-v | --no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>] [-e] [<path>...]'
|
||||||
. git-sh-setup
|
. git-sh-setup
|
||||||
|
|
||||||
usage () {
|
|
||||||
die 'git commit [-a] [-s] [-v | --no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>] [-e] [<path>...]'
|
|
||||||
}
|
|
||||||
|
|
||||||
all= logfile= use_commit= no_edit= log_given= log_message= verify=t signoff=
|
all= logfile= use_commit= no_edit= log_given= log_message= verify=t signoff=
|
||||||
while case "$#" in 0) break;; esac
|
while case "$#" in 0) break;; esac
|
||||||
do
|
do
|
||||||
|
@ -3,19 +3,8 @@
|
|||||||
# Copyright (c) 2005 Junio C Hamano
|
# Copyright (c) 2005 Junio C Hamano
|
||||||
#
|
#
|
||||||
|
|
||||||
. git-sh-setup
|
USAGE='[-n | -k] [-o <dir> | --stdout] [--signoff] [--check] [--mbox] [--diff-options] <upstream> [<our-head>]'
|
||||||
|
LONG_USAGE='Prepare each commit with its patch since our-head forked from upstream,
|
||||||
# Force diff to run in C locale.
|
|
||||||
LANG=C LC_ALL=C
|
|
||||||
export LANG LC_ALL
|
|
||||||
|
|
||||||
usage () {
|
|
||||||
echo >&2 "usage: $0"' [-n] [-o dir | --stdout] [--keep-subject] [--mbox]
|
|
||||||
[--check] [--signoff] [-<diff options>...]
|
|
||||||
[--help]
|
|
||||||
( from..to ... | upstream [ our-head ] )
|
|
||||||
|
|
||||||
Prepare each commit with its patch since our-head forked from upstream,
|
|
||||||
one file per patch, for e-mail submission. Each output file is
|
one file per patch, for e-mail submission. Each output file is
|
||||||
numbered sequentially from 1, and uses the first line of the commit
|
numbered sequentially from 1, and uses the first line of the commit
|
||||||
message (massaged for pathname safety) as the filename.
|
message (massaged for pathname safety) as the filename.
|
||||||
@ -28,10 +17,12 @@ as "[PATCH N/M] Subject", unless you have only one patch.
|
|||||||
|
|
||||||
When --mbox is specified, the output is formatted to resemble
|
When --mbox is specified, the output is formatted to resemble
|
||||||
UNIX mailbox format, and can be concatenated together for processing
|
UNIX mailbox format, and can be concatenated together for processing
|
||||||
with applymbox.
|
with applymbox.'
|
||||||
'
|
. git-sh-setup
|
||||||
exit 1
|
|
||||||
}
|
# Force diff to run in C locale.
|
||||||
|
LANG=C LC_ALL=C
|
||||||
|
export LANG LC_ALL
|
||||||
|
|
||||||
diff_opts=
|
diff_opts=
|
||||||
LF='
|
LF='
|
||||||
|
@ -3,6 +3,10 @@
|
|||||||
# Copyright (c) Linus Torvalds, 2005
|
# Copyright (c) Linus Torvalds, 2005
|
||||||
#
|
#
|
||||||
|
|
||||||
|
USAGE='<option>... <pattern> <path>...'
|
||||||
|
SUBDIRECTORY_OK='Yes'
|
||||||
|
. git-sh-setup
|
||||||
|
|
||||||
pattern=
|
pattern=
|
||||||
flags=()
|
flags=()
|
||||||
git_flags=()
|
git_flags=()
|
||||||
@ -40,8 +44,7 @@ while : ; do
|
|||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
[ "$pattern" ] || {
|
[ "$pattern" ] || {
|
||||||
echo >&2 "usage: 'git grep <pattern> [pathspec*]'"
|
usage
|
||||||
exit 1
|
|
||||||
}
|
}
|
||||||
git-ls-files -z "${git_flags[@]}" "$@" |
|
git-ls-files -z "${git_flags[@]}" "$@" |
|
||||||
xargs -0 grep "${flags[@]}" -e "$pattern"
|
xargs -0 grep "${flags[@]}" -e "$pattern"
|
||||||
|
@ -3,15 +3,13 @@
|
|||||||
# Copyright (c) 2005 Junio C Hamano
|
# Copyright (c) 2005 Junio C Hamano
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
USAGE='[-n] [--no-commit] [-s <strategy>]... <merge-message> <head> <remote>+'
|
||||||
. git-sh-setup
|
. git-sh-setup
|
||||||
|
|
||||||
LF='
|
LF='
|
||||||
'
|
'
|
||||||
|
|
||||||
usage () {
|
|
||||||
die "git-merge [-n] [--no-commit] [-s <strategy>]... <merge-message> <head> <remote>+"
|
|
||||||
}
|
|
||||||
|
|
||||||
all_strategies='recursive octopus resolve stupid ours'
|
all_strategies='recursive octopus resolve stupid ours'
|
||||||
default_strategies='recursive'
|
default_strategies='recursive'
|
||||||
use_strategies=
|
use_strategies=
|
||||||
|
13
git-pull.sh
13
git-pull.sh
@ -4,19 +4,10 @@
|
|||||||
#
|
#
|
||||||
# Fetch one or more remote refs and merge it/them into the current HEAD.
|
# Fetch one or more remote refs and merge it/them into the current HEAD.
|
||||||
|
|
||||||
|
USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] <repo> <head>...'
|
||||||
|
LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
|
||||||
. git-sh-setup
|
. git-sh-setup
|
||||||
|
|
||||||
usage () {
|
|
||||||
echo >&2 "usage: $0"' [-n] [--no-commit] [--no-summary] [--help]
|
|
||||||
[-s strategy]...
|
|
||||||
[<fetch-options>]
|
|
||||||
<repo> <head>...
|
|
||||||
|
|
||||||
Fetch one or more remote refs and merge it/them into the current HEAD.
|
|
||||||
'
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
strategy_args= no_summary= no_commit=
|
strategy_args= no_summary= no_commit=
|
||||||
while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
|
while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
|
||||||
do
|
do
|
||||||
|
@ -1,11 +1,8 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
USAGE='[--all] [--force] <repository> [<refspec>...]'
|
||||||
. git-sh-setup
|
. git-sh-setup
|
||||||
|
|
||||||
usage () {
|
|
||||||
die "Usage: git push [--all] [--force] <repository> [<refspec>]"
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# Parse out parameters and then stop at remote, so that we can
|
# Parse out parameters and then stop at remote, so that we can
|
||||||
# translate it using .git/branches information
|
# translate it using .git/branches information
|
||||||
has_all=
|
has_all=
|
||||||
|
@ -4,13 +4,11 @@
|
|||||||
# This file is licensed under the GPL v2, or a later version
|
# This file is licensed under the GPL v2, or a later version
|
||||||
# at the discretion of Linus Torvalds.
|
# at the discretion of Linus Torvalds.
|
||||||
|
|
||||||
usage()
|
USAGE='<commit> <url> [<head>]'
|
||||||
{
|
LONG_USAGE='Summarizes the changes since <commit> to the standard output,
|
||||||
echo "$0 <commit> <url> [ <head> ]"
|
and includes <url> in the message generated.'
|
||||||
echo " Summarizes the changes since <commit> to the standard output,"
|
SUBDIRECTORY_OK='Yes'
|
||||||
echo " and includes <url> in the message generated."
|
. git-sh-setup
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
revision=$1
|
revision=$1
|
||||||
url=$2
|
url=$2
|
||||||
|
@ -1,9 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
. git-sh-setup
|
|
||||||
|
|
||||||
usage () {
|
USAGE='[--mixed | --soft | --hard] [<commit-ish>]'
|
||||||
die 'Usage: git reset [--mixed | --soft | --hard] [<commit-ish>]'
|
. git-sh-setup
|
||||||
}
|
|
||||||
|
|
||||||
tmp=/var/tmp/reset.$$
|
tmp=/var/tmp/reset.$$
|
||||||
trap 'rm -f $tmp-*' 0 1 2 3 15
|
trap 'rm -f $tmp-*' 0 1 2 3 15
|
||||||
|
@ -4,11 +4,9 @@
|
|||||||
#
|
#
|
||||||
# Resolve two trees.
|
# Resolve two trees.
|
||||||
#
|
#
|
||||||
. git-sh-setup
|
|
||||||
|
|
||||||
usage () {
|
USAGE='<head> <remote> <merge-message>'
|
||||||
die "git-resolve <head> <remote> <merge-message>"
|
. git-sh-setup
|
||||||
}
|
|
||||||
|
|
||||||
dropheads() {
|
dropheads() {
|
||||||
rm -f -- "$GIT_DIR/MERGE_HEAD" \
|
rm -f -- "$GIT_DIR/MERGE_HEAD" \
|
||||||
|
14
git-tag.sh
14
git-tag.sh
@ -1,17 +1,9 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Copyright (c) 2005 Linus Torvalds
|
# Copyright (c) 2005 Linus Torvalds
|
||||||
|
|
||||||
GIT_DIR=`git-rev-parse --git-dir` || exit $?
|
USAGE='[-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <tagname> [<head>]'
|
||||||
|
SUBDIRECTORY_OK='Yes'
|
||||||
usage () {
|
. git-sh-setup
|
||||||
echo >&2 "Usage: git-tag [-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <tagname> [<head>]"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
die () {
|
|
||||||
echo >&2 "$*"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
annotate=
|
annotate=
|
||||||
signed=
|
signed=
|
||||||
|
Loading…
Reference in New Issue
Block a user