{"thread":{"id":"25888","subject":"[PATCH] merge-options.txt: order options alphabetically","startedAt":"2010-12-01T17:36:37Z","lastAt":"2010-12-01T17:36:37Z","messageCount":1,"participants":["jari.aalto@cante.net"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"156964","messageId":"1291224997-16813-1-git-send-email-jari.aalto@cante.net","threadId":"25888","inReplyTo":null,"subject":"[PATCH] merge-options.txt: order options alphabetically","fromName":"","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-01T17:36:37Z","receivedAt":"2010-12-01T17:36:37Z","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/merge-options.txt |   51 +++++++++++++++++++--------------------\n 1 files changed, 25 insertions(+), 26 deletions(-)\n\ndiff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt\nindex e33e0f8..15b6236 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,15 +30,13 @@ resolved as a fast-forward.\n With --no-log do not list one-line descriptions from the\n actual commits being merged.\n \n-\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+-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 --squash::\n --no-squash::\n@@ -49,23 +52,14 @@ 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+--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 --summary::\n --no-summary::\n@@ -77,6 +71,11 @@ ifndef::git-pull[]\n --quiet::\n \tOperate quietly.\n \n+-X <option>::\n+--strategy-option=<option>::\n+\tPass merge strategy specific option through to the merge\n+\tstrategy.\n+\n -v::\n --verbose::\n \tBe verbose.\n-- \n1.7.2.3\n"}]}