Last active
December 10, 2015 15:09
-
-
Save fcamblor/4452417 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I--J--K--L | |
/ / | |
F--G--H / | |
/ / | |
A--B / | |
\ / | |
C--D---E | |
I want to rebase branch "L" on branch "H", ideally having something like this : | |
I--J--K--L | |
/ / | |
F--G--H / | |
/ / | |
A--B / | |
\ / | |
C--D-------E | |
But when I "simply" git rebase H, I have the following applied : | |
C--D--E--I--J--L | |
/ | |
F--G--H | |
/ | |
A--B | |
\ | |
C--D-------E | |
Thus, everything on branch E were applied before branch L, and I lost the commit K denoting I merged E on L before rebasing. | |
Would you know a rebase option allowing to rebase the L branch onto the H branch without losing the merges ? | |
FYI, I created a project settings things on initial state, it is available here : https://github.com/fcamblor/rebasing-merged-branches | |
On this git repo : | |
- master = branch "B" | |
- branch1 = branch "E" | |
- branch2 = branch "H" | |
- branch2.1 = branch "L" | |
2 pictures demonstrating the initial state of the repo are available here : | |
http://imageshack.us/photo/my-images/204/capture20130104at14001p.png/ (Initial state) | |
http://imageshack.us/photo/my-images/189/capture20130104at14044p.png/ (State after rebase) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment