File tree Expand file tree Collapse file tree 1 file changed +13
-13
lines changed Expand file tree Collapse file tree 1 file changed +13
-13
lines changed Original file line number Diff line number Diff line change @@ -80,8 +80,8 @@ which is reachable from both 'A' and 'B' through the parent relationship.
80
80
81
81
For example, with this topology:
82
82
83
- o---o---o---B
84
- /
83
+ o---o---o---B
84
+ /
85
85
---o---1---o---o---o---A
86
86
87
87
the merge base between 'A' and 'B' is '1'.
@@ -116,11 +116,11 @@ the best common ancestor of all commits.
116
116
When the history involves criss-cross merges, there can be more than one
117
117
'best' common ancestor for two commits. For example, with this topology:
118
118
119
- ---1---o---A
120
- \ /
121
- X
122
- / \
123
- ---2---o---o---B
119
+ ---1---o---A
120
+ \ /
121
+ X
122
+ / \
123
+ ---2---o---o---B
124
124
125
125
both '1' and '2' are merge-bases of A and B. Neither one is better than
126
126
the other (both are 'best' merge bases). When the `--all` option is not given,
@@ -154,13 +154,13 @@ topic origin/master`, the history of remote-tracking branch
154
154
`origin/master` may have been rewound and rebuilt, leading to a
155
155
history of this shape:
156
156
157
- o---B1
158
- /
157
+ o---B1
158
+ /
159
159
---o---o---B2--o---o---o---B (origin/master)
160
- \
161
- B3
162
- \
163
- Derived (topic)
160
+ \
161
+ B3
162
+ \
163
+ Derived (topic)
164
164
165
165
where `origin/master` used to point at commits B3, B2, B1 and now it
166
166
points at B, and your `topic` branch was started on top of it back
You can’t perform that action at this time.
0 commit comments