{"thread":{"id":"25903","subject":"[PATCH] Documentation/*merge*.txt: Order options alphabetically","startedAt":"2010-12-01T20:00:47Z","lastAt":"2010-12-01T20:00:47Z","messageCount":1,"participants":["jari.aalto@cante.net"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"157003","messageId":"1291233647-20494-1-git-send-email-jari.aalto@cante.net","threadId":"25903","inReplyTo":null,"subject":"[PATCH] Documentation/*merge*.txt: Order options alphabetically","fromName":"","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-01T20:00:47Z","receivedAt":"2010-12-01T20:00:47Z","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\nIn git-merge.txt, define asciidoc variable to flag processing in\nmerge-options.txt. Move all options from git-merge.txt to\nmerge-options.txt so that that options can be presented in\nalphabetical order.\n\nSigned-off-by: Jari Aalto <jari.aalto@cante.net>\n---\n Documentation/git-merge.txt     |   19 +----------\n Documentation/merge-options.txt |   66 +++++++++++++++++++++++++-------------\n 2 files changed, 45 insertions(+), 40 deletions(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex d43416d..4a62d36 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -51,26 +51,11 @@ new scripts.  It is the same as `git merge -m <msg> <commit>...`.\n discouraged: while possible, it leaves you in a state that is hard to\n back out of in the case of a conflict.\n \n-\n OPTIONS\n -------\n-include::merge-options.txt[]\n \n--m <msg>::\n-\tSet the commit message to be used for the merge commit (in\n-\tcase one is created).\n-+\n-If `--log` is specified, a shortlog of the commits being merged\n-will be appended to the specified message.\n-+\n-The 'git fmt-merge-msg' command can be\n-used to give a good default for automated 'git merge'\n-invocations.\n-\n---rerere-autoupdate::\n---no-rerere-autoupdate::\n-\tAllow the rerere mechanism to update the index with the\n-\tresult of auto-conflict resolution if possible.\n+:git-merge: 1\n+include::merge-options.txt[]\n \n <commit>...::\n \tCommits, usually other branch heads, to merge into our branch.\ndiff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt\nindex e33e0f8..29aef16 100644\n--- a/Documentation/merge-options.txt\n+++ b/Documentation/merge-options.txt\n@@ -16,6 +16,11 @@ inspect and further tweak the merge result before committing.\n With --no-ff Generate a merge commit even if the merge\n resolved as a fast-forward.\n \n+--ff-only::\n+\tRefuse to merge and exit with a non-zero status unless the\n+\tcurrent `HEAD` is already up-to-date or the merge can be\n+\tresolved as a fast-forward.\n+\n --log[=<n>]::\n --no-log::\n \tIn addition to branch names, populate the log message with\n@@ -25,6 +30,38 @@ resolved as a fast-forward.\n With --no-log do not list one-line descriptions from the\n actual commits being merged.\n \n+ifdef::git-merge[]\n+-m <msg>::\n+\tSet the commit message to be used for the merge commit (in\n+\tcase one is created).\n++\n+If `--log` is specified, a shortlog of the commits being merged\n+will be appended to the specified message.\n++\n+The 'git fmt-merge-msg' command can be\n+used to give a good default for automated 'git merge'\n+invocations.\n+endif::git-merge[]\n+\n+ifndef::git-pull[]\n+-q::\n+--quiet::\n+\tOperate quietly.\n+\n+ifdef::git-merge[]\n+--rerere-autoupdate::\n+--no-rerere-autoupdate::\n+\tAllow the rerere mechanism to update the index with the\n+\tresult of auto-conflict resolution if possible.\n+endif::git-merge[]\n+\n+-s <strategy>::\n+--strategy=<strategy>::\n+\tUse the given merge strategy; can be supplied more than\n+\tonce to specify them in the order they should be tried.\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 --stat::\n -n::\n@@ -49,35 +86,18 @@ merge.\n With --no-squash perform the merge and commit the result. This\n option can be used to override --squash.\n \n---ff-only::\n-\tRefuse to merge and exit with a non-zero status unless the\n-\tcurrent `HEAD` is already up-to-date or the merge can be\n-\tresolved as a fast-forward.\n-\n--s <strategy>::\n---strategy=<strategy>::\n-\tUse the given merge strategy; can be supplied more than\n-\tonce to specify them in the order they should be tried.\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--X <option>::\n---strategy-option=<option>::\n-\tPass merge strategy specific option through to the merge\n-\tstrategy.\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-ifndef::git-pull[]\n--q::\n---quiet::\n-\tOperate quietly.\n-\n -v::\n --verbose::\n \tBe verbose.\n endif::git-pull[]\n+\n+-X <option>::\n+--strategy-option=<option>::\n+\tPass merge strategy specific option through to the merge\n+\tstrategy.\n+\n-- \n1.7.2.3\n"}]}