diff options
| author | Chris Webb <chris@arachsys.com> | 2012-06-26 21:55:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-26 22:08:10 (GMT) |
| commit | df5df20c1308f936ea542c86df1e9c6974168472 (patch) | |
| tree | 55d02ad50947cd1a71709572095294106f19ed22 /Documentation/git-rebase.txt | |
| parent | bc9e7dd41fe8b51cc7f2e79312a2ff777899f930 (diff) | |
| download | git-df5df20c1308f936ea542c86df1e9c6974168472.zip git-df5df20c1308f936ea542c86df1e9c6974168472.tar.gz git-df5df20c1308f936ea542c86df1e9c6974168472.tar.bz2 | |
rebase -i: support --root without --onto
Allow --root to be specified to rebase -i without --onto, making it
possible to edit and re-order all commits right back to the root(s).
If there is a conflict to be resolved when applying the first change,
the user will expect a sane index and working tree to get sensible
behaviour from git-diff and friends, so create a sentinel commit with an
empty tree to rebase onto. Automatically squash the sentinel with any
commits rebased directly onto it, so they end up as root commits in
their own right and retain their authorship and commit message.
Implicitly use rebase -i for non-interactive rebase of --root without
an --onto argument now that rebase -i can correctly do this.
Signed-off-by: Chris Webb <chris@arachsys.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 147fa1a..85b5e44 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -10,7 +10,7 @@ SYNOPSIS [verse] 'git rebase' [-i | --interactive] [options] [--onto <newbase>] [<upstream>] [<branch>] -'git rebase' [-i | --interactive] [options] --onto <newbase> +'git rebase' [-i | --interactive] [options] [--onto <newbase>] --root [<branch>] 'git rebase' --continue | --skip | --abort @@ -348,10 +348,11 @@ idea unless you know what you are doing (see BUGS below). --root:: Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase - the root commit(s) on a branch. Must be used with --onto, and + the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of - <upstream>). When used together with --preserve-merges, 'all' - root commits will be rewritten to have <newbase> as parent + <upstream>) whereas without --onto it will operate on every change. + When used together with both --onto and --preserve-merges, + 'all' root commits will be rewritten to have <newbase> as parent instead. --autosquash:: |