{"thread":{"id":"25909","subject":"[PATCH] git-am.txt: order options alphabetically","startedAt":"2010-12-01T20:22:14Z","lastAt":"2010-12-01T20:22:14Z","messageCount":1,"participants":["jari.aalto@cante.net"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"157012","messageId":"1291234934-21481-1-git-send-email-jari.aalto@cante.net","threadId":"25909","inReplyTo":null,"subject":"[PATCH] git-am.txt: order options alphabetically","fromName":"","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-01T20:22:14Z","receivedAt":"2010-12-01T20:22:14Z","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-am.txt |  133 +++++++++++++++++++++++-----------------------\n 1 files changed, 67 insertions(+), 66 deletions(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 51297d0..275ae8f 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -25,60 +25,42 @@ current branch.\n \n OPTIONS\n -------\n-(<mbox>|<Maildir>)...::\n-\tThe list of mailbox files to read patches from. If you do not\n-\tsupply this argument, the command reads from the standard input.\n-\tIf you supply directories, they will be treated as Maildirs.\n-\n--s::\n---signoff::\n-\tAdd a `Signed-off-by:` line to the commit message, using\n-\tthe committer identity of yourself.\n \n--k::\n---keep::\n-\tPass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).\n+-3::\n+--3way::\n+\tWhen the patch does not apply cleanly, fall back on\n+\t3-way merge if the patch records the identity of blobs\n+\tit is supposed to apply to and we have those blobs\n+\tavailable locally.\n \n---keep-cr::\n---no-keep-cr::\n-\tWith `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1])\n-\twith the same option, to prevent it from stripping CR at the end of\n-\tlines. `am.keepcr` configuration variable can be used to specify the\n-\tdefault behaviour.  `--no-keep-cr` is useful to override `am.keepcr`.\n+--abort::\n+\tRestore the original branch and abort the patching operation.\n \n -c::\n --scissors::\n+--no-scissors::\n \tRemove everything in body before a scissors line (see\n \tlinkgit:git-mailinfo[1]).\n \n---no-scissors::\n-\tIgnore scissors lines (see linkgit:git-mailinfo[1]).\n-\n--q::\n---quiet::\n-\tBe quiet. Only print error messages.\n+\tAlternatively ignore scissors lines (see linkgit:git-mailinfo[1]).\n \n--u::\n---utf8::\n-\tPass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).\n-\tThe proposed commit log message taken from the e-mail\n-\tis re-coded into UTF-8 encoding (configuration variable\n-\t`i18n.commitencoding` can be used to specify project's\n-\tpreferred encoding if it is not UTF-8).\n-+\n-This was optional in prior versions of git, but now it is the\n-default.   You can use `--no-utf8` to override this.\n+--committer-date-is-author-date::\n+\tBy default the command records the date from the e-mail\n+\tmessage as the commit author date, and uses the time of\n+\tcommit creation as the committer date. This allows the\n+\tuser to lie about the committer date by using the same\n+\tvalue as the author date.\n \n---no-utf8::\n-\tPass `-n` flag to 'git mailinfo' (see\n-\tlinkgit:git-mailinfo[1]).\n+-i::\n+--interactive::\n+\tRun interactively.\n \n--3::\n---3way::\n-\tWhen the patch does not apply cleanly, fall back on\n-\t3-way merge if the patch records the identity of blobs\n-\tit is supposed to apply to and we have those blobs\n-\tavailable locally.\n+--ignore-date::\n+\tBy default the command records the date from the e-mail\n+\tmessage as the commit author date, and uses the time of\n+\tcommit creation as the committer date. This allows the\n+\tuser to lie about the author date by using the same\n+\tvalue as the committer date.\n \n --ignore-date::\n --ignore-space-change::\n@@ -91,32 +73,24 @@ default.   You can use `--no-utf8` to override this.\n \tThese flags are passed to the 'git apply' (see linkgit:git-apply[1])\n \tprogram that applies\n \tthe patch.\n+-k::\n+--keep::\n+\tPass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).\n \n--i::\n---interactive::\n-\tRun interactively.\n-\n---committer-date-is-author-date::\n-\tBy default the command records the date from the e-mail\n-\tmessage as the commit author date, and uses the time of\n-\tcommit creation as the committer date. This allows the\n-\tuser to lie about the committer date by using the same\n-\tvalue as the author date.\n-\n---ignore-date::\n-\tBy default the command records the date from the e-mail\n-\tmessage as the commit author date, and uses the time of\n-\tcommit creation as the committer date. This allows the\n-\tuser to lie about the author date by using the same\n-\tvalue as the committer date.\n+--keep-cr::\n+--no-keep-cr::\n+\tWith `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1])\n+\twith the same option, to prevent it from stripping CR at the end of\n+\tlines. `am.keepcr` configuration variable can be used to specify the\n+\tdefault behaviour.  `--no-keep-cr` is useful to override `am.keepcr`.\n \n---skip::\n-\tSkip the current patch.  This is only meaningful when\n-\trestarting an aborted patch.\n+-q::\n+--quiet::\n+\tBe quiet. Only print error messages.\n \n---continue::\n -r::\n --resolved::\n+--continue::\n \tAfter a patch failure (e.g. attempting to apply\n \tconflicting patch), the user has applied it by hand and\n \tthe index file stores the result of the application.\n@@ -131,8 +105,35 @@ default.   You can use `--no-utf8` to override this.\n \tor `--skip` to handle the failure.  This is solely\n \tfor internal use between 'git rebase' and 'git am'.\n \n---abort::\n-\tRestore the original branch and abort the patching operation.\n+-s::\n+--signoff::\n+\tAdd a `Signed-off-by:` line to the commit message, using\n+\tthe committer identity of yourself.\n+\n+-u::\n+--utf8::\n+--no-utf8::\n+\tPass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).\n+\tThe proposed commit log message taken from the e-mail\n+\tis re-coded into UTF-8 encoding (configuration variable\n+\t`i18n.commitencoding` can be used to specify project's\n+\tpreferred encoding if it is not UTF-8).\n++\n+This was optional in prior versions of git, but now it is the\n+default.   You can use `--no-utf8` to override this.\n+\n+\tWith `--no-utf8', pass `-n` flag to 'git mailinfo' (see\n+\tlinkgit:git-mailinfo[1]).\n+\n+--skip::\n+\tSkip the current patch.  This is only meaningful when\n+\trestarting an aborted patch.\n+\n+(<mbox>|<Maildir>)...::\n+\tThe list of mailbox files to read patches from. If you do not\n+\tsupply this argument, the command reads from the standard input.\n+\tIf you supply directories, they will be treated as Maildirs.\n+\n \n DISCUSSION\n ----------\n-- \n1.7.2.3\n"}]}