{"thread":{"id":"21322","subject":"[PATCH] Documentation/merge-options.txt: order options in alphabetical groups","startedAt":"2009-10-22T09:24:52Z","lastAt":"2009-10-22T19:25:20Z","messageCount":3,"participants":["Jari Aalto","Stephen Boyd"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"125694","messageId":"87iqe7zspn.fsf@jondo.cante.net","threadId":"21322","inReplyTo":null,"subject":"[PATCH] Documentation/merge-options.txt: order options in alphabetical groups","fromName":"Jari Aalto","fromEmail":"jari.aalto@cante.net","sentAt":"2009-10-22T09:24:52Z","receivedAt":"2009-10-22T09:24:52Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"Signed-off-by: Jari Aalto <jari.aalto@cante.net>\n---\n Documentation/merge-options.txt |   79 ++++++++++++++++++++-------------------\n 1 files changed, 41 insertions(+), 38 deletions(-)\n\nThe --option and --no-options have been grouped together as in:\n\n    --option\n    --no-option\n\nThe alphabetical order is according to the --option.\n\ndiff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt\nindex adadf8e..f1fdb65 100644\n--- a/Documentation/merge-options.txt\n+++ b/Documentation/merge-options.txt\n@@ -1,43 +1,42 @@\n--q::\n---quiet::\n-\tOperate quietly.\n-\n--v::\n---verbose::\n-\tBe verbose.\n+--commit::\n+--no-commit::\n+\tPerform the merge and commit the result. This option can\n+\tbe used to override --no-commit.\n \n---stat::\n-\tShow a diffstat at the end of the merge. The diffstat is also\n-\tcontrolled by the configuration option merge.stat.\n+\tWith --no-commit perform the merge but pretend the merge\n+\tfailed and do not autocommit, to give the user a chance to\n+\tinspect and further tweak the merge result before committing.\n \n--n::\n---no-stat::\n-\tDo not show a diffstat at the end of the merge.\n+--ff::\n+--no-ff::\n+\tDo not generate a merge commit if the merge resolved as\n+\ta fast-forward, only update the branch pointer. This is\n+\tthe default behavior of git-merge.\n \n---summary::\n---no-summary::\n-\tSynonyms to --stat and --no-stat; these are deprecated and will be\n-\tremoved in the future.\n+\tWith --no-ff Generate a merge commit even if the merge\n+\tresolved as a fast-forward.\n \n --log::\n+--no-log::\n \tIn addition to branch names, populate the log message with\n \tone-line descriptions from the actual commits that are being\n \tmerged.\n \n---no-log::\n-\tDo not list one-line descriptions from the actual commits being\n-\tmerged.\n+\tWith --no-log do not list one-line descriptions from the\n+\tactual commits being merged.\n \n---no-commit::\n-\tPerform the merge but pretend the merge failed and do\n-\tnot autocommit, to give the user a chance to inspect and\n-\tfurther tweak the merge result before committing.\n \n---commit::\n-\tPerform the merge and commit the result. This option can\n-\tbe used to override --no-commit.\n+--stat::\n+-n::\n+--no-stat::\n+\tShow a diffstat at the end of the merge. The diffstat is also\n+\tcontrolled by the configuration option merge.stat.\n+\n+\tWith -n or --no-stat do not show a diffstat at the end of the\n+\tmerge.\n \n --squash::\n+--no-squash::\n \tProduce the working tree and index state as if a real\n \tmerge happened (except for the merge information),\n \tbut do not actually make a commit or\n@@ -47,18 +46,9 @@\n \ttop of the current branch whose effect is the same as\n \tmerging another branch (or more in case of an octopus).\n \n---no-squash::\n-\tPerform the merge and commit the result. This option can\n-\tbe used to override --squash.\n \n---no-ff::\n-\tGenerate a merge commit even if the merge resolved as a\n-\tfast-forward.\n-\n---ff::\n-\tDo not generate a merge commit if the merge resolved as\n-\ta fast-forward, only update the branch pointer. This is\n-\tthe default behavior of git-merge.\n+\tWith --no-squash perform the merge and commit the result. This\n+\toption can be used to override --squash.\n \n -s <strategy>::\n --strategy=<strategy>::\n@@ -67,3 +57,16 @@\n \tIf there is no `-s` option, a built-in list of strategies\n \tis used instead ('git-merge-recursive' when merging a single\n \thead, 'git-merge-octopus' otherwise).\n+\n+--summary::\n+--no-summary::\n+\tSynonyms to --stat and --no-stat; these are deprecated and will be\n+\tremoved in the future.\n+\n+-q::\n+--quiet::\n+\tOperate quietly.\n+\n+-v::\n+--verbose::\n+\tBe verbose.\n-- \n1.6.4.3\n"},{"id":"125720","messageId":"4AE0A961.7040900@gmail.com","threadId":"21322","inReplyTo":"87iqe7zspn.fsf@jondo.cante.net","subject":"Re: [PATCH] Documentation/merge-options.txt: order options in alphabetical groups","fromName":"Stephen Boyd","fromEmail":"bebarino@gmail.com","sentAt":"2009-10-22T18:50:09Z","receivedAt":"2009-10-22T18:50:09Z","isPatch":true,"sender":{"key":"bebarino@gmail.com","avatar":"https://avatars.githubusercontent.com/u/38832?v=4"},"body":"Jari Aalto wrote:\n> +--stat::\n> +-n::\n> +--no-stat::\n> +\tShow a diffstat at the end of the merge. The diffstat is also\n> +\tcontrolled by the configuration option merge.stat.\n> +\n> +\tWith -n or --no-stat do not show a diffstat at the end of the\n> +\tmerge.\n\nI thought we needed a plus before new paragraphs in these situations?\n"},{"id":"125727","messageId":"87tyxrw7rz.fsf@jondo.cante.net","threadId":"21322","inReplyTo":"4AE0A961.7040900@gmail.com","subject":"Re: [PATCH] Documentation/merge-options.txt: order options in alphabetical groups","fromName":"Jari Aalto","fromEmail":"jari.aalto@cante.net","sentAt":"2009-10-22T19:25:20Z","receivedAt":"2009-10-22T19:25:20Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"Signed-off-by: Jari Aalto <jari.aalto@cante.net>\n---\n Documentation/merge-options.txt |   88 ++++++++++++++++++++-------------------\n 1 files changed, 45 insertions(+), 43 deletions(-)\n\n Stephen Boyd <bebarino@gmail.com> writes:\n\n >> +\tcontrolled by the configuration option merge.stat.\n >> +\n >> +\tWith -n or --no-stat do not show a diffstat at the end of the\n >\n > I thought we needed a plus before new paragraphs in these situations?\n\n Corrected.\n\n Thanks,\n Jari\n\ndiff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt\nindex adadf8e..48d04a5 100644\n--- a/Documentation/merge-options.txt\n+++ b/Documentation/merge-options.txt\n@@ -1,43 +1,42 @@\n--q::\n---quiet::\n-\tOperate quietly.\n-\n--v::\n---verbose::\n-\tBe verbose.\n-\n---stat::\n-\tShow a diffstat at the end of the merge. The diffstat is also\n-\tcontrolled by the configuration option merge.stat.\n-\n--n::\n---no-stat::\n-\tDo not show a diffstat at the end of the merge.\n+--commit::\n+--no-commit::\n+\tPerform the merge and commit the result. This option can\n+\tbe used to override --no-commit.\n++\n+With --no-commit perform the merge but pretend the merge\n+failed and do not autocommit, to give the user a chance to\n+inspect and further tweak the merge result before committing.\n \n---summary::\n---no-summary::\n-\tSynonyms to --stat and --no-stat; these are deprecated and will be\n-\tremoved in the future.\n+--ff::\n+--no-ff::\n+\tDo not generate a merge commit if the merge resolved as\n+\ta fast-forward, only update the branch pointer. This is\n+\tthe default behavior of git-merge.\n++\n+With --no-ff Generate a merge commit even if the merge\n+resolved as a fast-forward.\n \n --log::\n+--no-log::\n \tIn addition to branch names, populate the log message with\n \tone-line descriptions from the actual commits that are being\n \tmerged.\n++\n+With --no-log do not list one-line descriptions from the\n+actual commits being merged.\n \n---no-log::\n-\tDo not list one-line descriptions from the actual commits being\n-\tmerged.\n-\n---no-commit::\n-\tPerform the merge but pretend the merge failed and do\n-\tnot autocommit, to give the user a chance to inspect and\n-\tfurther tweak the merge result before committing.\n \n---commit::\n-\tPerform the merge and commit the result. This option can\n-\tbe used to override --no-commit.\n+--stat::\n+-n::\n+--no-stat::\n+\tShow a diffstat at the end of the merge. The diffstat is also\n+\tcontrolled by the configuration option merge.stat.\n++\n+With -n or --no-stat do not show a diffstat at the end of the\n+merge.\n \n --squash::\n+--no-squash::\n \tProduce the working tree and index state as if a real\n \tmerge happened (except for the merge information),\n \tbut do not actually make a commit or\n@@ -46,19 +45,9 @@\n \tcommit.  This allows you to create a single commit on\n \ttop of the current branch whose effect is the same as\n \tmerging another branch (or more in case of an octopus).\n-\n---no-squash::\n-\tPerform the merge and commit the result. This option can\n-\tbe used to override --squash.\n-\n---no-ff::\n-\tGenerate a merge commit even if the merge resolved as a\n-\tfast-forward.\n-\n---ff::\n-\tDo not generate a merge commit if the merge resolved as\n-\ta fast-forward, only update the branch pointer. This is\n-\tthe default behavior of git-merge.\n++\n+With --no-squash perform the merge and commit the result. This\n+option can be used to override --squash.\n \n -s <strategy>::\n --strategy=<strategy>::\n@@ -67,3 +56,16 @@\n \tIf there is no `-s` option, a built-in list of strategies\n \tis used instead ('git-merge-recursive' when merging a single\n \thead, 'git-merge-octopus' otherwise).\n+\n+--summary::\n+--no-summary::\n+\tSynonyms to --stat and --no-stat; these are deprecated and will be\n+\tremoved in the future.\n+\n+-q::\n+--quiet::\n+\tOperate quietly.\n+\n+-v::\n+--verbose::\n+\tBe verbose.\n-- \n1.6.4.3\n"}]}