{"thread":{"id":"25885","subject":"[PATCH] git-commit.txt: Order options alphabetically","startedAt":"2010-12-01T15:52:11Z","lastAt":"2010-12-01T15:52:11Z","messageCount":1,"participants":["jari.aalto@cante.net"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"156949","messageId":"1291218731-13931-1-git-send-email-jari.aalto@cante.net","threadId":"25885","inReplyTo":null,"subject":"[PATCH] git-commit.txt: Order options alphabetically","fromName":"","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-01T15:52:11Z","receivedAt":"2010-12-01T15:52:11Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"From: Jari Aalto <jari.aalto@cante.net>\n\n\nSigned-off-by: Jari Aalto <jari.aalto@cante.net>\n---\n Documentation/git-commit.txt |  220 +++++++++++++++++++++---------------------\n 1 files changed, 110 insertions(+), 110 deletions(-)\n\ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex 42fb1f5..db9ed7e 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -59,73 +59,6 @@ OPTIONS\n \tbeen modified and deleted, but new files you have not\n \ttold git about are not affected.\n \n--C <commit>::\n---reuse-message=<commit>::\n-\tTake an existing commit object, and reuse the log message\n-\tand the authorship information (including the timestamp)\n-\twhen creating the commit.\n-\n--c <commit>::\n---reedit-message=<commit>::\n-\tLike '-C', but with '-c' the editor is invoked, so that\n-\tthe user can further edit the commit message.\n-\n---reset-author::\n-\tWhen used with -C/-c/--amend options, declare that the\n-\tauthorship of the resulting commit now belongs of the committer.\n-\tThis also renews the author timestamp.\n-\n---short::\n-\tWhen doing a dry-run, give the output in the short-format. See\n-\tlinkgit:git-status[1] for details. Implies `--dry-run`.\n-\n---porcelain::\n-\tWhen doing a dry-run, give the output in a porcelain-ready\n-\tformat. See linkgit:git-status[1] for details. Implies\n-\t`--dry-run`.\n-\n--z::\n-\tWhen showing `short` or `porcelain` status output, terminate\n-\tentries in the status output with NUL, instead of LF. If no\n-\tformat is given, implies the `--porcelain` output format.\n-\n--F <file>::\n---file=<file>::\n-\tTake the commit message from the given file.  Use '-' to\n-\tread the message from the standard input.\n-\n---author=<author>::\n-\tOverride the commit author. Specify an explicit author using the\n-\tstandard `A U Thor <author@example.com>` format. Otherwise <author>\n-\tis assumed to be a pattern and is used to search for an existing\n-\tcommit by that author (i.e. rev-list --all -i --author=<author>);\n-\tthe commit author is then copied from the first such commit found.\n-\n---date=<date>::\n-\tOverride the author date used in the commit.\n-\n--m <msg>::\n---message=<msg>::\n-\tUse the given <msg> as the commit message.\n-\n--t <file>::\n---template=<file>::\n-\tUse the contents of the given file as the initial version\n-\tof the commit message. The editor is invoked and you can\n-\tmake subsequent changes. If a message is specified using\n-\tthe `-m` or `-F` options, this option has no effect. This\n-\toverrides the `commit.template` configuration variable.\n-\n--s::\n---signoff::\n-\tAdd Signed-off-by line by the committer at the end of the commit\n-\tlog message.\n-\n--n::\n---no-verify::\n-\tThis option bypasses the pre-commit and commit-msg hooks.\n-\tSee also linkgit:githooks[5].\n-\n --allow-empty::\n \tUsually recording a commit that has the exact same tree as its\n \tsole parent commit is a mistake, and the command prevents you\n@@ -138,23 +71,6 @@ OPTIONS\n        empty commit message without using plumbing commands like\n        linkgit:git-commit-tree[1].\n \n---cleanup=<mode>::\n-\tThis option sets how the commit message is cleaned up.\n-\tThe  '<mode>' can be one of 'verbatim', 'whitespace', 'strip',\n-\tand 'default'. The 'default' mode will strip leading and\n-\ttrailing empty lines and #commentary from the commit message\n-\tonly if the message is to be edited. Otherwise only whitespace\n-\tremoved. The 'verbatim' mode does not change message at all,\n-\t'whitespace' removes just leading/trailing whitespace lines\n-\tand 'strip' removes both whitespace and commentary.\n-\n--e::\n---edit::\n-\tThe message taken from file with `-F`, command line with\n-\t`-m`, and from file with `-C` are usually used as the\n-\tcommit log message unmodified.  This option lets you\n-\tfurther edit the message taken from these sources.\n-\n --amend::\n \tUsed to amend the tip of the current branch. Prepare the tree\n \tobject you would want to replace the latest commit as usual\n@@ -180,6 +96,68 @@ You should understand the implications of rewriting history if you\n amend a commit that has already been published.  (See the \"RECOVERING\n FROM UPSTREAM REBASE\" section in linkgit:git-rebase[1].)\n \n+--author=<author>::\n+\tOverride the commit author. Specify an explicit author using the\n+\tstandard `A U Thor <author@example.com>` format. Otherwise <author>\n+\tis assumed to be a pattern and is used to search for an existing\n+\tcommit by that author (i.e. rev-list --all -i --author=<author>);\n+\tthe commit author is then copied from the first such commit found.\n+\n+-c <commit>::\n+--reedit-message=<commit>::\n+\tLike '-C', but with '-c' the editor is invoked, so that\n+\tthe user can further edit the commit message.\n+\n+-C <commit>::\n+--reuse-message=<commit>::\n+\tTake an existing commit object, and reuse the log message\n+\tand the authorship information (including the timestamp)\n+\twhen creating the commit.\n+\n+--cleanup=<mode>::\n+\tThis option sets how the commit message is cleaned up.\n+\tThe  '<mode>' can be one of 'verbatim', 'whitespace', 'strip',\n+\tand 'default'. The 'default' mode will strip leading and\n+\ttrailing empty lines and #commentary from the commit message\n+\tonly if the message is to be edited. Otherwise only whitespace\n+\tremoved. The 'verbatim' mode does not change message at all,\n+\t'whitespace' removes just leading/trailing whitespace lines\n+\tand 'strip' removes both whitespace and commentary.\n+\n+--date=<date>::\n+\tOverride the author date used in the commit.\n+\n+--dry-run::\n+\tDo not create a commit, but show a list of paths that are\n+\tto be committed, paths with local changes that will be left\n+\tuncommitted and paths that are untracked.\n+\n+-e::\n+--edit::\n+\tThe message taken from file with `-F`, command line with\n+\t`-m`, and from file with `-C` are usually used as the\n+\tcommit log message unmodified.  This option lets you\n+\tfurther edit the message taken from these sources.\n+\n+-F <file>::\n+--file=<file>::\n+\tTake the commit message from the given file.  Use '-' to\n+\tread the message from the standard input.\n+\n+-m <msg>::\n+--message=<msg>::\n+\tUse the given <msg> as the commit message.\n+\n+-n::\n+--no-verify::\n+\tThis option bypasses the pre-commit and commit-msg hooks.\n+\tSee also linkgit:githooks[5].\n+\n+--no-status::\n+\tDo not include the output of linkgit:git-status[1] in the\n+\tcommit message template when using an editor to prepare the\n+\tdefault commit message.  See option `--status'.\n+\n -i::\n --include::\n \tBefore making a commit out of staged contents so far,\n@@ -199,6 +177,50 @@ FROM UPSTREAM REBASE\" section in linkgit:git-rebase[1].)\n \tthe last commit without committing changes that have\n \talready been staged.\n \n+--porcelain::\n+\tWhen doing a dry-run, give the output in a porcelain-ready\n+\tformat. See linkgit:git-status[1] for details. Implies\n+\t`--dry-run`.\n+\n+-q::\n+--quiet::\n+\tSuppress commit summary message.\n+\n+--status::\n+\tInclude the output of linkgit:git-status[1] in the commit\n+\tmessage template when using an editor to prepare the commit\n+\tmessage.  Defaults to on, but can be used to override\n+\tconfiguration variable commit.status.  See option `--no-status'.\n+\n+--reset-author::\n+\tWhen used with -C/-c/--amend options, declare that the\n+\tauthorship of the resulting commit now belongs of the committer.\n+\tThis also renews the author timestamp.\n+\n+-s::\n+--signoff::\n+\tAdd Signed-off-by line by the committer at the end of the commit\n+\tlog message.\n+\n+--short::\n+\tWhen doing a dry-run, give the output in the short-format. See\n+\tlinkgit:git-status[1] for details. Implies `--dry-run`.\n+\n+-t <file>::\n+--template=<file>::\n+\tUse the contents of the given file as the initial version\n+\tof the commit message. The editor is invoked and you can\n+\tmake subsequent changes. If a message is specified using\n+\tthe `-m` or `-F` options, this option has no effect. This\n+\toverrides the `commit.template` configuration variable.\n+\n+-v::\n+--verbose::\n+\tShow unified diff between the HEAD commit and what\n+\twould be committed at the bottom of the commit message\n+\ttemplate.  Note that this diff output doesn't have its\n+\tlines prefixed with '#'.\n+\n -u[<mode>]::\n --untracked-files[=<mode>]::\n \tShow untracked files (Default: 'all').\n@@ -216,32 +238,10 @@ See linkgit:git-config[1] for configuration variable\n used to change the default for when the option is not\n specified.\n \n--v::\n---verbose::\n-\tShow unified diff between the HEAD commit and what\n-\twould be committed at the bottom of the commit message\n-\ttemplate.  Note that this diff output doesn't have its\n-\tlines prefixed with '#'.\n-\n--q::\n---quiet::\n-\tSuppress commit summary message.\n-\n---dry-run::\n-\tDo not create a commit, but show a list of paths that are\n-\tto be committed, paths with local changes that will be left\n-\tuncommitted and paths that are untracked.\n-\n---status::\n-\tInclude the output of linkgit:git-status[1] in the commit\n-\tmessage template when using an editor to prepare the commit\n-\tmessage.  Defaults to on, but can be used to override\n-\tconfiguration variable commit.status.\n-\n---no-status::\n-\tDo not include the output of linkgit:git-status[1] in the\n-\tcommit message template when using an editor to prepare the\n-\tdefault commit message.\n+-z::\n+\tWhen showing `short` or `porcelain` status output, terminate\n+\tentries in the status output with NUL, instead of LF. If no\n+\tformat is given, implies the `--porcelain` output format.\n \n \\--::\n \tDo not interpret any more arguments as options.\n-- \n1.7.2.3\n"}]}