{"thread":{"id":"3256","subject":"[PATCH] format-patch: Remove last vestiges of --mbox option","startedAt":"2006-02-07T09:37:54Z","lastAt":"2006-02-07T09:37:54Z","messageCount":1,"participants":["Andreas Ericsson"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"15665","messageId":"20060207093739.BB4DF5BE7F@nox.op5.se","threadId":"3256","inReplyTo":null,"subject":"[PATCH] format-patch: Remove last vestiges of --mbox option","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2006-02-07T09:37:54Z","receivedAt":"2006-02-07T09:37:54Z","isPatch":true,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Don't mention it in docs or --help output.\nRemove mbox, date and author variables from git-format-patch.sh.\n\nUse DESCRIPTION text from man-page to update LONG_USAGE output. It's\na bit silly to have two texts saying the same thing in different words,\nand I'm too lazy to update both.\n\nSigned-off-by: Andreas Ericsson \n\n---\n\n Documentation/git-format-patch.txt | 32 ++++++++++----------------------\n git-format-patch.sh | 36 ++++++++++++++++++------------------\n 2 files changed, 28 insertions(+), 40 deletions(-)\n\n6fc31fee29cfea12a6213a775231ac6c136989d3\ndiff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt\nindex 47705de..9ac0636 100644\n--- a/Documentation/git-format-patch.txt\n+++ b/Documentation/git-format-patch.txt\n@@ -9,28 +9,27 @@ git-format-patch - Prepare patches for e\n SYNOPSIS\n --------\n [verse]\n-'git-format-patch' [-n | -k] [-o | --stdout] [-s] [-c] [--mbox]\n+'git-format-patch' [-n | -k] [-o | --stdout] [-s] [-c]\n \t\t [--diff-options] []\n \n DESCRIPTION\n -----------\n Prepare each commit with its patch since head forked from\n- head, one file per patch, for e-mail submission. Each\n-output file is numbered sequentially from 1, and uses the first\n-line of the commit message (massaged for pathname safety) as the\n-filename.\n+ head, one file per patch formatted to resemble UNIX mailbox\n+format, for e-mail submission or use with gitlink:git-am[1].\n \n-When -o is specified, output files are created in that\n-directory; otherwise in the current working directory.\n+Each output file is numbered sequentially from 1, and uses the\n+first line of the commit message (massaged for pathname safety)\n+as the filename.\n+\n+When -o is specified, output files are created in ; otherwise\n+they are created in the current working directory. This option\n+is ignored if --stdout is specified.\n \n When -n is specified, instead of \"[PATCH] Subject\", the first\n line is formatted as \"[PATCH N/M] Subject\", unless you have only\n one patch.\n \n-When --mbox is specified, the output is formatted to resemble\n-UNIX mailbox format, and can be concatenated together for\n-processing with applymbox.\n-\n \n OPTIONS\n -------\n@@ -45,11 +44,6 @@ OPTIONS\n \tDo not strip/add '[PATCH]' from the first line of the\n \tcommit log message.\n \n--a|--author, -d|--date::\n-\tOutput From: and Date: headers for commits made by\n-\tyourself as well. Usually these are output only for\n-\tcommits made by people other than yourself.\n-\n -s|--signoff::\n \tAdd `Signed-off-by:` line to the commit message, using\n \tthe committer identity of yourself.\n@@ -61,12 +55,6 @@ OPTIONS\n has a SP character immediately followed by a TAB\n character.\n \n--m|--mbox::\n-\tFormat the output files for closer to mbox format by\n-\tadding a phony Unix \"From \" line, so they can be\n-\tconcatenated together and fed to `git-applymbox`.\n-\tImplies --author and --date.\n-\n --stdout::\n \tThis flag generates the mbox formatted output to the\n \tstandard output, instead of saving them into a file per\ndiff --git a/git-format-patch.sh b/git-format-patch.sh\nindex 5fb8ce1..e54c9e4 100755\n--- a/git-format-patch.sh\n+++ b/git-format-patch.sh\n@@ -3,23 +3,23 @@\n # Copyright (c) 2005 Junio C Hamano\n #\n \n-USAGE='[-n | -k] [-o | --stdout] [--signoff] [--check] [--mbox] [--diff-options] []'\n-LONG_USAGE='Prepare each commit with its patch since our-head forked from upstream,\n-one file per patch, for e-mail submission. Each output file is\n-numbered sequentially from 1, and uses the first line of the commit\n-message (massaged for pathname safety) as the filename.\n-\n-There are three output modes. By default, output files are created in\n-the current working directory; when -o is specified, they are created\n-in that directory instead; when --stdout is specified, they are spit\n-on standard output, and can be piped to git-am.\n-\n-When -n is specified, instead of \"[PATCH] Subject\", the first line is formatted\n-as \"[PATCH N/M] Subject\", unless you have only one patch.\n-\n-When --mbox is specified, the output is formatted to resemble\n-UNIX mailbox format, and can be concatenated together for processing\n-with applymbox.'\n+USAGE='[-n | -k] [-o | --stdout] [--signoff] [--check] [--diff-options] []'\n+LONG_USAGE='Prepare each commit with its patch since head forked from\n+ head, one file per patch formatted to resemble UNIX mailbox\n+format, for e-mail submission or use with git-am.\n+\n+Each output file is numbered sequentially from 1, and uses the\n+first line of the commit message (massaged for pathname safety)\n+as the filename.\n+\n+When -o is specified, output files are created in ; otherwise\n+they are created in the current working directory. This option\n+is ignored if --stdout is specified.\n+\n+When -n is specified, instead of \"[PATCH] Subject\", the first\n+line is formatted as \"[PATCH N/M] Subject\", unless you have only\n+one patch.'\n+\n . git-sh-setup\n \n # Force diff to run in C locale.\n@@ -48,7 +48,7 @@ do\n -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)\n signoff=t ;;\n --st|--std|--stdo|--stdou|--stdout)\n- stdout=t mbox=t date=t author=t ;;\n+ stdout=t ;;\n -o=*|--o=*|--ou=*|--out=*|--outp=*|--outpu=*|--output=*|--output-=*|\\\n --output-d=*|--output-di=*|--output-dir=*|--output-dire=*|\\\n --output-direc=*|--output-direct=*|--output-directo=*|\\\n-- \n1.1.6.ga2c6\n"}]}