diff options
| author | Jon Loeliger <jdl@freescale.com> | 2005-11-06 23:30:56 -0600 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-06 23:32:04 -0800 |
| commit | 93d69d86912c44206543f6670e93f9fc6f2f859f (patch) | |
| tree | 0ad7728ed8054bfbcaa42960a7e9a90532d89f18 /git-format-patch.sh | |
| parent | 90279074ca5cc336a8bfffd47d19d089b291b432 (diff) | |
| download | git-93d69d86912c44206543f6670e93f9fc6f2f859f.tar.gz git-93d69d86912c44206543f6670e93f9fc6f2f859f.tar.xz | |
Refactored merge options into separate merge-options.txt.
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>
Diffstat (limited to 'git-format-patch.sh')
| -rwxr-xr-x | git-format-patch.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-format-patch.sh b/git-format-patch.sh index b43ba3909..548d2d584 100755 --- a/git-format-patch.sh +++ b/git-format-patch.sh @@ -8,6 +8,7 @@ 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, @@ -63,6 +64,9 @@ do --output-directo|--output-director|--output-directory) case "$#" in 1) usage ;; esac; shift outdir="$1" ;; + -h|--h|--he|--hel|--help) + usage + ;; -*' '* | -*"$LF"* | -*' '*) # Ignore diff option that has whitespace for now. ;; |