diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-15 22:28:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-15 22:28:39 -0700 |
| commit | 0248269de7cca134098c35330c96a84a39eca214 (patch) | |
| tree | 6a699c9f0efbe26f3f87b2a9f8b3d0e721b90f48 /git-rebase.txt | |
| parent | b61a777e41bce40f57f77443aca23664309e215d (diff) | |
| download | git-htmldocs-0248269de7cca134098c35330c96a84a39eca214.tar.gz | |
Autogenerated HTML docs for v1.7.11.2-249-g31c79
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 2d71e4b97..b30ed352e 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -10,7 +10,7 @@ SYNOPSIS [verse] 'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>] -'git rebase' [-i | --interactive] [options] [--exec <cmd>] --onto <newbase> +'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>] 'git rebase' --continue | --skip | --abort @@ -369,10 +369,11 @@ squash/fixup series. --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:: |