path: root/Documentation/howto
diff options
authorJunio C Hamano <>2016-10-26 20:14:55 (GMT)
committerJunio C Hamano <>2016-10-26 20:14:55 (GMT)
commit4abeeb62a04365d7595cd1ef83ce56764c4a8553 (patch)
tree20233f75ce13b6742f35825408a5521d825af45b /Documentation/howto
parentf4db874d9adc3d974a085b1238aad0048e7f2674 (diff)
parent6750f6269917969dbb191406c3ed31d5a75a9edd (diff)
Merge branch 'po/fix-doc-merge-base-illustration'
Some AsciiDoc formatter mishandles a displayed illustration with tabs in it. Adjust a few of them in merge-base documentation to work around them. * po/fix-doc-merge-base-illustration: doc: fix the 'revert a faulty merge' ASCII art tab spacing doc: fix merge-base ASCII art tab spacing
Diffstat (limited to 'Documentation/howto')
1 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.txt
index 462255e..19f59cc 100644
--- a/Documentation/howto/revert-a-faulty-merge.txt
+++ b/Documentation/howto/revert-a-faulty-merge.txt
@@ -30,7 +30,7 @@ The history immediately after the "revert of the merge" would look like
- /
+ /
where A and B are on the side development that was not so good, M is the
@@ -47,7 +47,7 @@ After the developers of the side branch fix their mistakes, the history
may look like this:
- /
+ /
where C and D are to fix what was broken in A and B, and you may already
@@ -81,7 +81,7 @@ In such a situation, you would want to first revert the previous revert,
which would make the history look like this:
- /
+ /
where Y is the revert of W. Such a "revert of the revert" can be done
@@ -93,14 +93,14 @@ This history would (ignoring possible conflicts between what W and W..Y
changed) be equivalent to not having W or Y at all in the history:
- /
+ /
and merging the side branch again will not have conflict arising from an
earlier revert and revert of the revert.
- / /
+ / /
Of course the changes made in C and D still can conflict with what was
@@ -111,13 +111,13 @@ faulty A and B, and redone the changes on top of the updated mainline
after the revert, the history would have looked like this:
- / \
+ / \
---A---B A'--B'--C'
If you reverted the revert in such a case as in the previous example:
- / \ /
+ / \ /
---A---B A'--B'--C'
where Y is the revert of W, A' and B' are rerolled A and B, and there may
@@ -129,7 +129,7 @@ lot of overlapping changes that result in conflicts. So do not do "revert
of revert" blindly without thinking..
- / \
+ / \
---A---B A'--B'--C'
In the history with rebased side branch, W (and M) are behind the merge