SHOW:
|
|
- or go back to the newest paste.
1 | before amend of C1: | |
2 | - | C3---C2---C1---A1---A2 |
2 | + | C3---C2---C1 <- master |
3 | \ | |
4 | \---A1---A2 <- A | |
5 | - | C3---C2---C1' |
5 | + | |
6 | after amend of C1: | |
7 | - | \---C1---A1---A2 |
7 | + | C3---C2---C1' <- master |
8 | \ | |
9 | - | what I want now: |
9 | + | \---C1---A1---A2 <- A |
10 | - | C3---C2---C1'---A1---A2 |
10 | + | |
11 | what git tries to do if i checkout A, rebase master: | |
12 | C3---C2---C1' <- master | |
13 | \ | |
14 | \---C1---A1---A2 <- A | |
15 | ||
16 | what I want instead: | |
17 | C3---C2---C1' <- master | |
18 | \ | |
19 | \---A1---A2 <- A |