From: jari.aalto@cante.net Date: Wed, 01 Dec 2010 18:01:18 GMT Subject: [PATCH] git-rebase.txt: (OPTIONS): order alphabetically Message-ID: <1291226478-17289-1-git-send-email-jari.aalto@cante.net> From: Jari Aalto Signed-off-by: Jari Aalto --- Documentation/git-rebase.txt | 183 +++++++++++++++++++++--------------------- 1 files changed, 93 insertions(+), 90 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 30e5c0e..297b85b 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -204,6 +204,10 @@ rebase.autosquash:: OPTIONS ------- + +:: + Working branch; defaults to HEAD. + :: Starting point at which to create the new commits. If the --onto option is not specified, the starting point is @@ -218,66 +222,24 @@ leave out at most one of A and B, in which case it defaults to HEAD. Upstream branch to compare against. May be any valid commit, not just an existing branch name. -:: - Working branch; defaults to HEAD. - ---continue:: - Restart the rebasing process after having resolved a merge conflict. - --abort:: Restore the original branch and abort the rebase operation. + See also `--continue' and `--skip'. ---skip:: - Restart the rebasing process by skipping the current patch. - --m:: ---merge:: - Use merging strategies to rebase. When the recursive (default) merge - strategy is used, this allows rebase to be aware of renames on the - upstream side. +--autosquash:: +--no-autosquash:: + When the commit log message begins with "squash! ..." (or + "fixup! ..."), and there is a commit whose title begins with + the same ..., automatically modify the todo list of rebase -i + so that the commit marked for squashing comes right after the + commit to be modified, and change the action of the moved + commit from `pick` to `squash` (or `fixup`). + -Note that a rebase merge works by replaying each commit from the working -branch on top of the branch. Because of this, when a merge -conflict happens, the side reported as 'ours' is the so-far rebased -series, starting with , and 'theirs' is the working branch. In -other words, the sides are swapped. - --s :: ---strategy=:: - Use the given merge strategy. - If there is no `-s` option 'git merge-recursive' is used - instead. This implies --merge. +This option is only valid when the '--interactive' option is used. + -Because 'git rebase' replays each commit from the working branch -on top of the branch using the given strategy, using -the 'ours' strategy simply discards all patches from the , -which makes little sense. - --X :: ---strategy-option=:: - Pass the through to the merge strategy. - This implies `\--merge` and, if no strategy has been - specified, `-s recursive`. Note the reversal of 'ours' and - 'theirs' as noted in above for the `-m` option. - --q:: ---quiet:: - Be quiet. Implies --no-stat. - --v:: ---verbose:: - Be verbose. Implies --stat. - ---stat:: - Show a diffstat of what changed upstream since the last rebase. The - diffstat is also controlled by the configuration option rebase.stat. - --n:: ---no-stat:: - Do not show a diffstat as part of the rebase process. - ---no-verify:: - This option bypasses the pre-rebase hook. See also linkgit:githooks[5]. +If the '--autosquash' option is enabled by default using the +configuration variable `rebase.autosquash`, this option can be +used to override and disable this setting. -C:: Ensure at least lines of surrounding context match before @@ -285,6 +247,16 @@ which makes little sense. context exist they all must match. By default no context is ever ignored. +--continue:: + Restart the rebasing process after having resolved a merge conflict. + See also `--abort' and `--skip'. + +--committer-date-is-author-date:: +--ignore-date:: + These flags are passed to 'git am' to easily change the dates + of the rebased commits (see linkgit:git-am[1]). + Incompatible with the --interactive option. + -f:: --force-rebase:: Force the rebase even if the current branch is a descendant @@ -299,23 +271,62 @@ fresh commits so it can be remerged successfully without needing to "revert the reversion" (see the link:howto/revert-a-faulty-merge.txt[revert-a-faulty-merge How-To] for details). +-i:: +--interactive:: + Make a list of the commits which are about to be rebased. Let the + user edit that list before rebasing. This mode can also be used to + split commits (see SPLITTING COMMITS below). + --ignore-whitespace:: --whitespace=