{"thread":{"id":"25913","subject":"[PATCH] git-pull.txt, merge-options.txt: order options alphabetically","startedAt":"2010-12-01T20:51:18Z","lastAt":"2010-12-01T20:51:18Z","messageCount":1,"participants":["jari.aalto@cante.net"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"157020","messageId":"1291236678-22365-1-git-send-email-jari.aalto@cante.net","threadId":"25913","inReplyTo":null,"subject":"[PATCH] git-pull.txt, merge-options.txt: order options alphabetically","fromName":"","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-01T20:51:18Z","receivedAt":"2010-12-01T20:51:18Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"From: Jari Aalto \n\nRemove idndef from merge-options.txt because only two generic -q nad\n-v options were used. Simplify git-pull.txt by dropping dependency on\nmerge-options.txt and copy definitions of -q and -v in order to list\nall comman generic options in alphabetical order.\n\nSigned-off-by: Jari Aalto \n---\n Documentation/git-pull.txt | 14 ++++++++----\n Documentation/merge-options.txt | 44 ++++++++++++++++++--------------------\n 2 files changed, 30 insertions(+), 28 deletions(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex e47361f..1648237 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -87,11 +87,12 @@ must be given before the options meant for 'git fetch'.\n Options related to merging\n ~~~~~~~~~~~~~~~~~~~~~~~~~~\n \n-include::merge-options.txt[]\n-\n-:git-pull: 1\n+-q::\n+--quiet::\n+\tOperate quietly.\n \n --rebase::\n+--no-rebase::\n \tRebase the current branch on top of the upstream branch after\n \tfetching. If there is a remote-tracking branch corresponding to\n \tthe upstream branch and the upstream branch was rebased since last\n@@ -107,8 +108,11 @@ It rewrites history, which does not bode well when you\n published that history already. Do *not* use this option\n unless you have read linkgit:git-rebase[1] carefully.\n \n---no-rebase::\n-\tOverride earlier --rebase.\n+\tWith `--no-rebase' Override earlier `--rebase'.\n+\n+-v::\n+--verbose::\n+\tBe verbose.\n \n Options related to fetching\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~\ndiff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt\nindex e33e0f8..684b7be 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 --no-log::\n \tIn addition to branch names, populate the log message with\n@@ -25,15 +30,9 @@ 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+-q::\n+--quiet::\n+\tOperate quietly.\n \n --squash::\n --no-squash::\n@@ -49,11 +48,6 @@ 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 ::\n --strategy=::\n \tUse the given merge strategy; can be supplied more than\n@@ -62,22 +56,26 @@ option can be used to override --squash.\n \tis used instead ('git merge-recursive' when merging a single\n \thead, 'git merge-octopus' otherwise).\n \n--X