mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored merge options into separate merge-options.txt.

Browse Source 
Refactored fetch options into separate fetch-options.txt.
Made git-merge use merge-options.
Made git-fetch use fetch-options.
Made git-pull use merge-options and fetch-options.
Added --help option to git-pull and git-format-patch scripts.
Rewrote Documentation/Makefile to dynamically determine
include dependencies.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Jon Loeliger
2005-11-06 23:30:56 -06:00
committed by Junio C Hamano
parent 90279074ca
commit 93d69d8691
9 changed files with 71 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
git-pull.sh Executable file → Normal file
View File

@ -7,7 +7,14 @@
. git-sh-setup || die "Not a git archive"
usage () {
die "git pull [-n] [--no-commit] [-s strategy]... <repo> <head>..."
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=
@ -33,6 +40,9 @@ do
esac
strategy_args="${strategy_args}-s $strategy "
;;
-h|--h|--he|--hel|--help)
usage
;;
-*)
# Pass thru anything that is meant for fetch.
break