{"thread":{"id":"25890","subject":"[PATCH] git-rebase.txt: (OPTIONS): order alphabetically","startedAt":"2010-12-01T18:01:18Z","lastAt":"2010-12-01T18:01:18Z","messageCount":1,"participants":["jari.aalto@cante.net"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"156969","messageId":"1291226478-17289-1-git-send-email-jari.aalto@cante.net","threadId":"25890","inReplyTo":null,"subject":"[PATCH] git-rebase.txt: (OPTIONS): order alphabetically","fromName":"","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-01T18:01:18Z","receivedAt":"2010-12-01T18:01:18Z","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-rebase.txt |  183 +++++++++++++++++++++---------------------\n 1 files changed, 93 insertions(+), 90 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 30e5c0e..297b85b 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -204,6 +204,10 @@ rebase.autosquash::\n \n OPTIONS\n -------\n+\n+<branch>::\n+\tWorking branch; defaults to HEAD.\n+\n <newbase>::\n \tStarting point at which to create the new commits. If the\n \t--onto option is not specified, the starting point is\n@@ -218,66 +222,24 @@ leave out at most one of A and B, in which case it defaults to HEAD.\n \tUpstream branch to compare against.  May be any valid commit,\n \tnot just an existing branch name.\n \n-<branch>::\n-\tWorking branch; defaults to HEAD.\n-\n---continue::\n-\tRestart the rebasing process after having resolved a merge conflict.\n-\n --abort::\n \tRestore the original branch and abort the rebase operation.\n+\tSee also `--continue' and `--skip'.\n \n---skip::\n-\tRestart the rebasing process by skipping the current patch.\n-\n--m::\n---merge::\n-\tUse merging strategies to rebase.  When the recursive (default) merge\n-\tstrategy is used, this allows rebase to be aware of renames on the\n-\tupstream side.\n+--autosquash::\n+--no-autosquash::\n+\tWhen the commit log message begins with \"squash! ...\" (or\n+\t\"fixup! ...\"), and there is a commit whose title begins with\n+\tthe same ..., automatically modify the todo list of rebase -i\n+\tso that the commit marked for squashing comes right after the\n+\tcommit to be modified, and change the action of the moved\n+\tcommit from `pick` to `squash` (or `fixup`).\n +\n-Note that a rebase merge works by replaying each commit from the working\n-branch on top of the <upstream> branch.  Because of this, when a merge\n-conflict happens, the side reported as 'ours' is the so-far rebased\n-series, starting with <upstream>, and 'theirs' is the working branch.  In\n-other words, the sides are swapped.\n-\n--s <strategy>::\n---strategy=<strategy>::\n-\tUse the given merge strategy.\n-\tIf there is no `-s` option 'git merge-recursive' is used\n-\tinstead.  This implies --merge.\n+This option is only valid when the '--interactive' option is used.\n +\n-Because 'git rebase' replays each commit from the working branch\n-on top of the <upstream> branch using the given strategy, using\n-the 'ours' strategy simply discards all patches from the <branch>,\n-which makes little sense.\n-\n--X <strategy-option>::\n---strategy-option=<strategy-option>::\n-\tPass the <strategy-option> through to the merge strategy.\n-\tThis implies `\\--merge` and, if no strategy has been\n-\tspecified, `-s recursive`.  Note the reversal of 'ours' and\n-\t'theirs' as noted in above for the `-m` option.\n-\n--q::\n---quiet::\n-\tBe quiet. Implies --no-stat.\n-\n--v::\n---verbose::\n-\tBe verbose. Implies --stat.\n-\n---stat::\n-\tShow a diffstat of what changed upstream since the last rebase. The\n-\tdiffstat is also controlled by the configuration option rebase.stat.\n-\n--n::\n---no-stat::\n-\tDo not show a diffstat as part of the rebase process.\n-\n---no-verify::\n-\tThis option bypasses the pre-rebase hook.  See also linkgit:githooks[5].\n+If the '--autosquash' option is enabled by default using the\n+configuration variable `rebase.autosquash`, this option can be\n+used to override and disable this setting.\n \n -C<n>::\n \tEnsure at least <n> lines of surrounding context match before\n@@ -285,6 +247,16 @@ which makes little sense.\n \tcontext exist they all must match.  By default no context is\n \tever ignored.\n \n+--continue::\n+\tRestart the rebasing process after having resolved a merge conflict.\n+\tSee also `--abort' and `--skip'.\n+\n+--committer-date-is-author-date::\n+--ignore-date::\n+\tThese flags are passed to 'git am' to easily change the dates\n+\tof the rebased commits (see linkgit:git-am[1]).\n+\tIncompatible with the --interactive option.\n+\n -f::\n --force-rebase::\n \tForce the rebase even if the current branch is a descendant\n@@ -299,23 +271,62 @@ fresh commits so it can be remerged successfully without needing to \"revert\n the reversion\" (see the\n link:howto/revert-a-faulty-merge.txt[revert-a-faulty-merge How-To] for details).\n \n+-i::\n+--interactive::\n+\tMake a list of the commits which are about to be rebased.  Let the\n+\tuser edit that list before rebasing.  This mode can also be used to\n+\tsplit commits (see SPLITTING COMMITS below).\n+\n --ignore-whitespace::\n --whitespace=<option>::\n \tThese flag are passed to the 'git apply' program\n \t(see linkgit:git-apply[1]) that applies the patch.\n \tIncompatible with the --interactive option.\n \n---committer-date-is-author-date::\n---ignore-date::\n-\tThese flags are passed to 'git am' to easily change the dates\n-\tof the rebased commits (see linkgit:git-am[1]).\n-\tIncompatible with the --interactive option.\n+-m::\n+--merge::\n+\tUse merging strategies to rebase.  When the recursive (default) merge\n+\tstrategy is used, this allows rebase to be aware of renames on the\n+\tupstream side.\n++\n+Note that a rebase merge works by replaying each commit from the working\n+branch on top of the <upstream> branch.  Because of this, when a merge\n+conflict happens, the side reported as 'ours' is the so-far rebased\n+series, starting with <upstream>, and 'theirs' is the working branch.  In\n+other words, the sides are swapped.\n \n--i::\n---interactive::\n-\tMake a list of the commits which are about to be rebased.  Let the\n-\tuser edit that list before rebasing.  This mode can also be used to\n-\tsplit commits (see SPLITTING COMMITS below).\n+-n::\n+--no-stat::\n+\tDo not show a diffstat as part of the rebase process.\n+\n+--no-ff::\n+\tWith --interactive, cherry-pick all rebased commits instead of\n+\tfast-forwarding over the unchanged ones.  This ensures that the\n+\tentire history of the rebased branch is composed of new commits.\n++\n+Without --interactive, this is a synonym for --force-rebase.\n++\n+You may find this helpful after reverting a topic branch merge, as this option\n+recreates the topic branch with fresh commits so it can be remerged\n+successfully without needing to \"revert the reversion\" (see the\n+link:howto/revert-a-faulty-merge.txt[revert-a-faulty-merge How-To] for details).\n+--no-verify::\n+\tThis option bypasses the pre-rebase hook.  See also linkgit:githooks[5].\n+\n+-s <strategy>::\n+--strategy=<strategy>::\n+\tUse the given merge strategy.\n+\tIf there is no `-s` option 'git merge-recursive' is used\n+\tinstead.  This implies --merge.\n++\n+Because 'git rebase' replays each commit from the working branch\n+on top of the <upstream> branch using the given strategy, using\n+the 'ours' strategy simply discards all patches from the <branch>,\n+which makes little sense.\n+\n+--skip::\n+\tRestart the rebasing process by skipping the current patch.\n+\tSee also `--abort' and `--contnue'.\n \n -p::\n --preserve-merges::\n@@ -326,6 +337,10 @@ with the `--interactive` option explicitly is generally not a good\n idea unless you know what you are doing (see BUGS below).\n \n \n+-q::\n+--quiet::\n+\tBe quiet. Implies --no-stat.\n+\n --root::\n \tRebase all commits reachable from <branch>, instead of\n \tlimiting them with an <upstream>.  This allows you to rebase\n@@ -335,32 +350,20 @@ idea unless you know what you are doing (see BUGS below).\n \troot commits will be rewritten to have <newbase> as parent\n \tinstead.\n \n---autosquash::\n---no-autosquash::\n-\tWhen the commit log message begins with \"squash! ...\" (or\n-\t\"fixup! ...\"), and there is a commit whose title begins with\n-\tthe same ..., automatically modify the todo list of rebase -i\n-\tso that the commit marked for squashing comes right after the\n-\tcommit to be modified, and change the action of the moved\n-\tcommit from `pick` to `squash` (or `fixup`).\n-+\n-This option is only valid when the '--interactive' option is used.\n-+\n-If the '--autosquash' option is enabled by default using the\n-configuration variable `rebase.autosquash`, this option can be\n-used to override and disable this setting.\n+--stat::\n+\tShow a diffstat of what changed upstream since the last rebase. The\n+\tdiffstat is also controlled by the configuration option rebase.stat.\n \n---no-ff::\n-\tWith --interactive, cherry-pick all rebased commits instead of\n-\tfast-forwarding over the unchanged ones.  This ensures that the\n-\tentire history of the rebased branch is composed of new commits.\n-+\n-Without --interactive, this is a synonym for --force-rebase.\n-+\n-You may find this helpful after reverting a topic branch merge, as this option\n-recreates the topic branch with fresh commits so it can be remerged\n-successfully without needing to \"revert the reversion\" (see the\n-link:howto/revert-a-faulty-merge.txt[revert-a-faulty-merge How-To] for details).\n+-v::\n+--verbose::\n+\tBe verbose. Implies --stat.\n+\n+-X <strategy-option>::\n+--strategy-option=<strategy-option>::\n+\tPass the <strategy-option> through to the merge strategy.\n+\tThis implies `\\--merge` and, if no strategy has been\n+\tspecified, `-s recursive`.  Note the reversal of 'ours' and\n+\t'theirs' as noted in above for the `-m` option.\n \n include::merge-strategies.txt[]\n \n-- \n1.7.2.3\n"}]}