diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-11-07 07:19:13 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-11-07 07:19:13 +0000 |
| commit | d8c9d433c3925d52d9a78bab8de03ee3de469440 (patch) | |
| tree | 45bb8e11ae632ebce0ab4b6da37afc6fb063ee08 /git-rebase.txt | |
| parent | 125a17bb6c6b500f4d3b9cad9d7f3c5fabb78330 (diff) | |
| download | git-htmldocs-d8c9d433c3925d52d9a78bab8de03ee3de469440.tar.gz | |
Autogenerated HTML docs for v1.4.3.4-gbd45
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 65 |
1 files changed, 57 insertions, 8 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 10f2924f4..03e867a40 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -51,20 +51,69 @@ would be: D---E---F---G master ------------ -While, starting from the same point, the result of either of the following -commands: +The latter form is just a short-hand of `git checkout topic` +followed by `git rebase master`. - git-rebase --onto master~1 master - git-rebase --onto master~1 master topic +Here is how you would transplant a topic branch based on one +branch to another, to pretend that you forked the topic branch +from the latter branch, using `rebase --onto`. -would be: +First let's assume your 'topic' is based on branch 'next'. +For example feature developed in 'topic' depends on some +functionality which is found in 'next'. ------------ - A'--B'--C' topic - / - D---E---F---G master + o---o---o---o---o master + \ + o---o---o---o---o next + \ + o---o---o topic +------------ + +We would want to make 'topic' forked from branch 'master', +for example because the functionality 'topic' branch depend on +got merged into more stable 'master' branch, like this: + +------------ + o---o---o---o---o master + | \ + | o'--o'--o' topic + \ + o---o---o---o---o next ------------ +We can get this using the following command: + + git-rebase --onto master next topic + + +Another example of --onto option is to rebase part of a +branch. If we have the following situation: + +------------ + H---I---J topicB + / + E---F---G topicA + / + A---B---C---D master +------------ + +then the command + + git-rebase --onto master topicA topicB + +would result in: + +------------ + H'--I'--J' topicB + / + | E---F---G topicA + |/ + A---B---C---D master +------------ + +This is useful when topicB does not depend on topicA. + In case of conflict, git-rebase will stop at the first problematic commit and leave conflict markers in the tree. You can use git diff to locate the markers (<<<<<<) and make edits to resolve the conflict. For each |