From: Dirk Wallenstein <halsmit@t-online.de>
To: git@vger.kernel.org
Cc: Nanako Shiraishi <nanako3@lavabit.com>,
Thomas Ackermann <th.acker@arcor.de>
Subject: [PATCH] howto: Use all-space indentation in ASCII art
Date: Mon, 15 Jul 2013 18:46:58 +0200 [thread overview]
Message-ID: <20130715164658.GA8675@bottich> (raw)
Keep the sketch aligned independent of the tabstop width used.
Signed-off-by: Dirk Wallenstein <halsmit@t-online.de>
---
Documentation/howto/revert-a-faulty-merge.txt | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.txt
index 075418e..4b75bfc 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
this:
---o---o---o---M---x---x---W
- /
+ /
---A---B
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:
---o---o---o---M---x---x---W---x
- /
+ /
---A---B-------------------C---D
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:
---o---o---o---M---x---x---W---x---Y
- /
+ /
---A---B-------------------C---D
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 nor Y at all in the history:
---o---o---o---M---x---x-------x----
- /
+ /
---A---B-------------------C---D
and merging the side branch again will not have conflict arising from an
earlier revert and revert of the revert.
---o---o---o---M---x---x-------x-------*
- / /
+ / /
---A---B-------------------C---D
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:
---o---o---o---M---x---x---W---x---x
- / \
+ / \
---A---B A'--B'--C'
If you reverted the revert in such a case as in the previous example:
---o---o---o---M---x---x---W---x---x---Y---*
- / \ /
+ / \ /
---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..
---o---o---o---M---x---x---W---x---x
- / \
+ / \
---A---B A'--B'--C'
In the history with rebased side branch, W (and M) are behind the merge
--
1.8.3.2.50.g531c8dd
next reply other threads:[~2013-07-15 17:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-15 16:46 Dirk Wallenstein [this message]
2013-07-15 22:00 ` [PATCH] howto: Use all-space indentation in ASCII art Junio C Hamano
2013-07-16 8:24 ` Dirk Wallenstein
2013-07-16 17:13 ` Junio C Hamano
2013-07-16 18:01 ` Dirk Wallenstein
2013-07-31 16:54 ` [PATCH 0/2] Remove tabs from howto documents Dirk Wallenstein
2013-07-31 17:01 ` Fredrik Gustafsson
[not found] ` <cover.1375288760.git.halsmit@t-online.de>
2013-07-31 16:54 ` [PATCH 1/2] howto: Suppress indentation with tabs Dirk Wallenstein
[not found] ` <4d37bfa3326469ab5b7cdbf0018f7aa671c2d74a.1375288760.git.halsmit@t-online.de>
2013-07-31 16:54 ` [PATCH 2/2] howto: Eliminate all tabs Dirk Wallenstein
2013-07-31 17:03 ` Junio C Hamano
2013-07-31 17:34 ` Dirk Wallenstein
2013-08-03 20:20 ` Piotr Krukowiecki
[not found] ` <CAA01CsqW1FWm8ExK7hypHp1_Jm0-kc1REQeuPYjbzU=aUQ+L9g@mail.gmail.com>
2013-08-05 15:32 ` Junio C Hamano
2013-07-16 18:26 ` [PATCH] howto: Use all-space indentation in ASCII art Jonathan Nieder
2013-07-16 18:38 ` Dirk Wallenstein
2013-07-16 18:42 ` A Large Angry SCM
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130715164658.GA8675@bottich \
--to=halsmit@t-online.de \
--cc=git@vger.kernel.org \
--cc=nanako3@lavabit.com \
--cc=th.acker@arcor.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).