Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
freku045@student.liu.se 2005-12-13 23:30:31 +01:00 коммит произвёл Junio C Hamano
Родитель aa9dc7afd2
Коммит 806f36d4d7
14 изменённых файлов: 39 добавлений и 89 удалений

Просмотреть файл

@ -1,13 +1,8 @@
#!/bin/sh
die () {
echo >&2 "$*"
exit 1
}
usage() {
die "usage: git add [-n] [-v] <file>..."
}
USAGE='[-n] [-v] <file>...'
SUBDIRECTORY_OK='Yes'
. git-sh-setup
show_only=
verbose=
@ -29,8 +24,6 @@ while : ; do
shift
done
GIT_DIR=$(git-rev-parse --git-dir) || exit
if test -f "$GIT_DIR/info/exclude"
then
git-ls-files -z \

Просмотреть файл

@ -18,13 +18,9 @@
##
## 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
usage () {
echo >&2 "applymbox [-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]"
exit 1
}
keep_subject= query_apply= continue= utf8= resume=t
while case "$#" in 0) break ;; esac
do

Просмотреть файл

@ -1,9 +1,7 @@
#!/bin/sh
. git-sh-setup
usage () {
die "usage: git checkout [-f] [-b <new_branch>] [<branch>] [<paths>...]"
}
USAGE='[-f] [-b <new_branch>] [<branch>] [<paths>...]'
. git-sh-setup
old=$(git-rev-parse HEAD)
new=

Просмотреть файл

@ -9,7 +9,7 @@
unset CDPATH
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
}

Просмотреть файл

@ -3,12 +3,9 @@
# Copyright (c) 2005 Linus Torvalds
#
USAGE='[-a] [-s] [-v | --no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>] [-e] [<path>...]'
. 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=
while case "$#" in 0) break;; esac
do

Просмотреть файл

@ -3,19 +3,8 @@
# Copyright (c) 2005 Junio C Hamano
#
. git-sh-setup
# 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,
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,
one file per patch, for e-mail submission. Each output file is
numbered sequentially from 1, and uses the first line of the commit
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
UNIX mailbox format, and can be concatenated together for processing
with applymbox.
'
exit 1
}
with applymbox.'
. git-sh-setup
# Force diff to run in C locale.
LANG=C LC_ALL=C
export LANG LC_ALL
diff_opts=
LF='

Просмотреть файл

@ -3,6 +3,10 @@
# Copyright (c) Linus Torvalds, 2005
#
USAGE='<option>... <pattern> <path>...'
SUBDIRECTORY_OK='Yes'
. git-sh-setup
pattern=
flags=()
git_flags=()
@ -40,8 +44,7 @@ while : ; do
shift
done
[ "$pattern" ] || {
echo >&2 "usage: 'git grep <pattern> [pathspec*]'"
exit 1
usage
}
git-ls-files -z "${git_flags[@]}" "$@" |
xargs -0 grep "${flags[@]}" -e "$pattern"

Просмотреть файл

@ -3,15 +3,13 @@
# Copyright (c) 2005 Junio C Hamano
#
USAGE='[-n] [--no-commit] [-s <strategy>]... <merge-message> <head> <remote>+'
. git-sh-setup
LF='
'
usage () {
die "git-merge [-n] [--no-commit] [-s <strategy>]... <merge-message> <head> <remote>+"
}
all_strategies='recursive octopus resolve stupid ours'
default_strategies='recursive'
use_strategies=

Просмотреть файл

@ -4,19 +4,10 @@
#
# 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
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=
while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
do

Просмотреть файл

@ -1,11 +1,8 @@
#!/bin/sh
USAGE='[--all] [--force] <repository> [<refspec>...]'
. git-sh-setup
usage () {
die "Usage: git push [--all] [--force] <repository> [<refspec>]"
}
# Parse out parameters and then stop at remote, so that we can
# translate it using .git/branches information
has_all=

Просмотреть файл

@ -4,13 +4,11 @@
# This file is licensed under the GPL v2, or a later version
# at the discretion of Linus Torvalds.
usage()
{
echo "$0 <commit> <url> [ <head> ]"
echo " Summarizes the changes since <commit> to the standard output,"
echo " and includes <url> in the message generated."
exit 1
}
USAGE='<commit> <url> [<head>]'
LONG_USAGE='Summarizes the changes since <commit> to the standard output,
and includes <url> in the message generated.'
SUBDIRECTORY_OK='Yes'
. git-sh-setup
revision=$1
url=$2

Просмотреть файл

@ -1,9 +1,7 @@
#!/bin/sh
. git-sh-setup
usage () {
die 'Usage: git reset [--mixed | --soft | --hard] [<commit-ish>]'
}
USAGE='[--mixed | --soft | --hard] [<commit-ish>]'
. git-sh-setup
tmp=/var/tmp/reset.$$
trap 'rm -f $tmp-*' 0 1 2 3 15

Просмотреть файл

@ -4,11 +4,9 @@
#
# Resolve two trees.
#
. git-sh-setup
usage () {
die "git-resolve <head> <remote> <merge-message>"
}
USAGE='<head> <remote> <merge-message>'
. git-sh-setup
dropheads() {
rm -f -- "$GIT_DIR/MERGE_HEAD" \

Просмотреть файл

@ -1,17 +1,9 @@
#!/bin/sh
# Copyright (c) 2005 Linus Torvalds
GIT_DIR=`git-rev-parse --git-dir` || exit $?
usage () {
echo >&2 "Usage: git-tag [-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <tagname> [<head>]"
exit 1
}
die () {
echo >&2 "$*"
exit 1
}
USAGE='[-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <tagname> [<head>]'
SUBDIRECTORY_OK='Yes'
. git-sh-setup
annotate=
signed=