git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] doc: fix merge-base ASCII art tab spacing
@ 2016-10-20 23:40 Philip Oakley
  2016-10-21  0:22 ` Jeff King
  2016-10-21  0:27 ` Junio C Hamano
  0 siblings, 2 replies; 10+ messages in thread
From: Philip Oakley @ 2016-10-20 23:40 UTC (permalink / raw)
  To: GitList; +Cc: Junio C Hamano, Philip Oakley

The doc-tool stack does not always respect the 'tab = 8 spaces' rule,
particularly the git-scm doc pages https://git-scm.com/docs/git-merge-base
and the Git generated html pages.

Use just spaces within the block of the ascii art.

Noticed when reviewing Junio's suggested update to `git merge-base`
https://public-inbox.org/git/xmqqmvi2sj8f.fsf@gitster.mtv.corp.google.com/T/#u


Signed-off-by: Philip Oakley <philipoakley@iee.org>
---

A fixed consistent prefix of tabs is OK, but once that lead is done, stay
with spaces only.

This complements the jc/merge-base-fp-only series.

---
 Documentation/git-merge-base.txt | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt
index 808426f..b968b64 100644
--- a/Documentation/git-merge-base.txt
+++ b/Documentation/git-merge-base.txt
@@ -80,8 +80,8 @@ which is reachable from both 'A' and 'B' through the parent relationship.
 
 For example, with this topology:
 
-		 o---o---o---B
-		/
+	         o---o---o---B
+	        /
 	---o---1---o---o---o---A
 
 the merge base between 'A' and 'B' is '1'.
@@ -116,11 +116,11 @@ the best common ancestor of all commits.
 When the history involves criss-cross merges, there can be more than one
 'best' common ancestor for two commits.  For example, with this topology:
 
-       ---1---o---A
-	   \ /
-	    X
-	   / \
-       ---2---o---o---B
+	---1---o---A
+	    \ /
+	     X
+	    / \
+	---2---o---o---B
 
 both '1' and '2' are merge-bases of A and B.  Neither one is better than
 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
 `origin/master` may have been rewound and rebuilt, leading to a
 history of this shape:
 
-			 o---B1
-			/
+	                 o---B1
+	                /
 	---o---o---B2--o---o---o---B (origin/master)
-		\
-		 B3
-		  \
-		   Derived (topic)
+	        \
+	         B3
+	          \
+	           Derived (topic)
 
 where `origin/master` used to point at commits B3, B2, B1 and now it
 points at B, and your `topic` branch was started on top of it back
-- 
2.9.0.windows.1.323.g0305acf


^ permalink raw reply related	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-10-25 11:40 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-20 23:40 [PATCH] doc: fix merge-base ASCII art tab spacing Philip Oakley
2016-10-21  0:22 ` Jeff King
2016-10-21  0:48   ` Junio C Hamano
2016-10-21  0:27 ` Junio C Hamano
2016-10-21 21:26   ` Philip Oakley
2016-10-21 22:54     ` Junio C Hamano
2016-10-22  5:45       ` Philip Oakley
2016-10-24 21:54       ` [PATCH] doc: fix the 'revert a faulty merge' " Philip Oakley
2016-10-25 11:39         ` Johannes Schindelin
2016-10-22  1:09     ` [PATCH] doc: fix merge-base " Jeff King

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 NNTP newsgroup(s).