diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-22 21:34:02 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-22 21:34:02 +0400 |
commit | c5c23745d8d6eb0504a16851b9b080ec3ded94f9 (patch) | |
tree | dc33066ecc7196f86129447c1e1b17f2740df4dd /Documentation | |
parent | c3e160886214c3e7d1e939918900c56e0d1aca56 (diff) | |
parent | 5887ac821f9df614cfcf3349960523e1c36f2de7 (diff) |
Merge branch 'ew/rebase'
* ew/rebase:
rebase --merge: fix for rebasing more than 7 commits.
rebase: error out for NO_PYTHON if they use recursive merge
Add renaming-rebase test.
rebase: Allow merge strategies to be used when rebasing
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-rebase.txt | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 08ee4aabaf..c339c4525c 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -7,7 +7,7 @@ git-rebase - Rebase local commits to a new head SYNOPSIS -------- -'git-rebase' [--onto <newbase>] <upstream> [<branch>] +'git-rebase' [--merge] [--onto <newbase>] <upstream> [<branch>] 'git-rebase' --continue | --skip | --abort @@ -106,6 +106,24 @@ OPTIONS --abort:: Restore the original branch and abort the rebase operation. +--skip:: + Restart the rebasing process by skipping the current patch. + This does not work with the --merge option. + +--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. + +-s <strategy>, \--strategy=<strategy>:: + Use the given merge strategy; can be supplied more than + once to specify them in the order they should be tried. + If there is no `-s` option, a built-in list of strategies + is used instead (`git-merge-recursive` when merging a single + head, `git-merge-octopus` otherwise). This implies --merge. + +include::merge-strategies.txt[] + NOTES ----- When you rebase a branch, you are changing its history in a way that |