-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathrebase-onto-2.txt
41 lines (31 loc) · 1.16 KB
/
rebase-onto-2.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
Initial state:
==============
A - B - C - D - E - F - G - H master
\
\
I - J - K - L branchA
\
\
M - N - O branchB
EITHER: After git checkout branchA; git rebase master
(or git rebase master branchB):
=====================================================
A - B - C - D - E - F - G - H master
\ \
\ \
I - J I' - J' - K' - L' branchA
\
\
M - N - O branchB
OR: After git checkout branchB; git rebase branchA
(or git rebase branchA branchB)
==================================================
A - B - C - D - E - F - G - H master
\
\
I' - J' - K' - L' branchA
\
\
M' - N' - O' branchB
(assuming I' is similar enough to I and J' is similar enough
to J that Git can recognize them as equivalent)