diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-01-18 18:26:37 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-01-18 18:26:37 +0000 |
| commit | bd53dbff51079dc26ea27b00d94b28a5229c0fec (patch) | |
| tree | ed0a78743f67e293b2302e91fefa24e6e579c428 /git-rebase.txt | |
| parent | 4efe0e79bcead21602c1f6669f07d4739358ca1a (diff) | |
| download | git-htmldocs-bd53dbff51079dc26ea27b00d94b28a5229c0fec.tar.gz | |
Autogenerated HTML docs for v1.6.1-203-ga83c8
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index c8ad86a56..3d6d429e5 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -8,10 +8,11 @@ git-rebase - Forward-port local commits to the updated upstream head SYNOPSIS -------- [verse] -'git rebase' [-i | --interactive] [-v | --verbose] [-m | --merge] - [-s <strategy> | --strategy=<strategy>] [--no-verify] - [-C<n>] [ --whitespace=<option>] [-p | --preserve-merges] - [--onto <newbase>] <upstream> [<branch>] +'git rebase' [-i | --interactive] [options] [--onto <newbase>] + <upstream> [<branch>] +'git rebase' [-i | --interactive] [options] --onto <newbase> + --root [<branch>] + 'git rebase' --continue | --skip | --abort DESCRIPTION @@ -22,7 +23,8 @@ it remains on the current branch. All changes made by commits in the current branch but that are not in <upstream> are saved to a temporary area. This is the same set -of commits that would be shown by `git log <upstream>..HEAD`. +of commits that would be shown by `git log <upstream>..HEAD` (or +`git log HEAD`, if --root is specified). The current branch is reset to <upstream>, or <newbase> if the --onto option was supplied. This has the exact same effect as @@ -255,6 +257,15 @@ OPTIONS --preserve-merges:: Instead of ignoring merges, try to recreate them. +--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 + 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 + instead. + include::merge-strategies.txt[] NOTES |