diff options
| author | Andreas Ericsson <ae@op5.se> | 2006-02-07 09:37:54 +0000 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-07 02:09:55 -0800 |
| commit | 66f04f38f42024dceb1679fc4d672de3746cf237 (patch) | |
| tree | 652b3d7bdea643a262eac779f1e4e1c20cda1874 /git-format-patch.sh | |
| parent | 90768daaa006516c7ae69ed89d7c2e67243dfac1 (diff) | |
| download | git-66f04f38f42024dceb1679fc4d672de3746cf237.tar.gz | |
format-patch: Remove last vestiges of --mbox option
Don't mention it in docs or --help output.
Remove mbox, date and author variables from git-format-patch.sh.
Use DESCRIPTION text from man-page to update LONG_USAGE output. It's
a bit silly to have two texts saying the same thing in different words,
and I'm too lazy to update both.
Signed-off-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-format-patch.sh')
| -rwxr-xr-x | git-format-patch.sh | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/git-format-patch.sh b/git-format-patch.sh index 5fb8ce1fbc..e54c9e4a94 100755 --- a/git-format-patch.sh +++ b/git-format-patch.sh @@ -3,23 +3,23 @@ # Copyright (c) 2005 Junio C Hamano # -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. +USAGE='[-n | -k] [-o <dir> | --stdout] [--signoff] [--check] [--diff-options] <his> [<mine>]' +LONG_USAGE='Prepare each commit with its patch since <mine> head forked from +<his> head, one file per patch formatted to resemble UNIX mailbox +format, for e-mail submission or use with git-am. -There are three output modes. By default, output files are created in -the current working directory; when -o is specified, they are created -in that directory instead; when --stdout is specified, they are spit -on standard output, and can be piped to git-am. +Each output file is numbered sequentially from 1, and uses the +first line of the commit message (massaged for pathname safety) +as the filename. -When -n is specified, instead of "[PATCH] Subject", the first line is formatted -as "[PATCH N/M] Subject", unless you have only one patch. +When -o is specified, output files are created in <dir>; otherwise +they are created in the current working directory. This option +is ignored if --stdout is specified. + +When -n is specified, instead of "[PATCH] Subject", the first +line is formatted 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.' . git-sh-setup # Force diff to run in C locale. @@ -48,7 +48,7 @@ do -s|--s|--si|--sig|--sign|--signo|--signof|--signoff) signoff=t ;; --st|--std|--stdo|--stdou|--stdout) - stdout=t mbox=t date=t author=t ;; + stdout=t ;; -o=*|--o=*|--ou=*|--out=*|--outp=*|--outpu=*|--output=*|--output-=*|\ --output-d=*|--output-di=*|--output-dir=*|--output-dire=*|\ --output-direc=*|--output-direct=*|--output-directo=*|\ |