threads / patch / 54034

patchdocs: commit-graph: fix some whitespace in the diagram

Subject: [PATCH] docs: commit-graph: fix some whitespace in the diagram

## tl;dr

3 messages between Aug 13, 2020 and Aug 13, 2020. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Johannes Berg· Aug 13, 2020, 14:50 UTC · lore

In the merge diagram, some whitespace is missing which makes it a bit confusing, fix that.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
 Documentation/technical/commit-graph.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Show changes to Documentation/technical/commit-graph.txt +3 −3

diff --git a/Documentation/technical/commit-graph.txt b/Documentation/technical/commit-graph.txt
index 808fa30b99f2..f14a7659aa87 100644
--- a/Documentation/technical/commit-graph.txt
+++ b/Documentation/technical/commit-graph.txt
@@ -210,12 +210,12 @@ file.
 			    +---------------------+
 			    |                     |
  +-----------------------+  +---------------------+
- |  graph-{hash2} |->|                     |
+ |  graph-{hash2}        |->|                     |
  +-----------------------+  +---------------------+
 	  |                 |                     |
  +-----------------------+  +---------------------+
  |                       |  |                     |
- |  graph-{hash1} |->|                     |
+ |  graph-{hash1}        |->|                     |
  |                       |  |                     |
  +-----------------------+  +---------------------+
 	  |                  tmp_graphXXX
@@ -223,7 +223,7 @@ file.
  |                       |
  |                       |
  |                       |
- |  graph-{hash0} |
+ |  graph-{hash0}        |
  |                       |
  |                       |
  |                       |

-- 
2.26.2

Derrick Stolee· Aug 13, 2020, 16:50 UTC · re: Johannes Berg · lore

Re: [PATCH] docs: commit-graph: fix some whitespace in the diagram

On 8/13/2020 10:50 AM, Johannes Berg wrote:

> In the merge diagram, some whitespace is missing which
> makes it a bit confusing, fix that.

Thanks for noticing and fixing this. This must have been due to some un-careful find/replace on my part.

-Stolee

Show 24 quoted lines

>  			    +---------------------+
>  			    |                     |
>   +-----------------------+  +---------------------+
> - |  graph-{hash2} |->|                     |
> + |  graph-{hash2}        |->|                     |
>   +-----------------------+  +---------------------+
>  	  |                 |                     |
>   +-----------------------+  +---------------------+
>   |                       |  |                     |
> - |  graph-{hash1} |->|                     |
> + |  graph-{hash1}        |->|                     |
>   |                       |  |                     |
>   +-----------------------+  +---------------------+
>  	  |                  tmp_graphXXX
> @@ -223,7 +223,7 @@ file.
>   |                       |
>   |                       |
>   |                       |
> - |  graph-{hash0} |
> + |  graph-{hash0}        |
>   |                       |
>   |                       |
>   |                       |
>

Junio C Hamano· Aug 13, 2020, 18:30 UTC · re: Johannes Berg · lore

Re: [PATCH] docs: commit-graph: fix some whitespace in the diagram

Johannes Berg <johannes@sipsolutions.net> writes:

Show 7 quoted lines

> In the merge diagram, some whitespace is missing which
> makes it a bit confusing, fix that.
>
> Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
> ---
>  Documentation/technical/commit-graph.txt | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Thanks, will queue.

Show 29 quoted lines

>
> diff --git a/Documentation/technical/commit-graph.txt b/Documentation/technical/commit-graph.txt
> index 808fa30b99f2..f14a7659aa87 100644
> --- a/Documentation/technical/commit-graph.txt
> +++ b/Documentation/technical/commit-graph.txt
> @@ -210,12 +210,12 @@ file.
>  			    +---------------------+
>  			    |                     |
>   +-----------------------+  +---------------------+
> - |  graph-{hash2} |->|                     |
> + |  graph-{hash2}        |->|                     |
>   +-----------------------+  +---------------------+
>  	  |                 |                     |
>   +-----------------------+  +---------------------+
>   |                       |  |                     |
> - |  graph-{hash1} |->|                     |
> + |  graph-{hash1}        |->|                     |
>   |                       |  |                     |
>   +-----------------------+  +---------------------+
>  	  |                  tmp_graphXXX
> @@ -223,7 +223,7 @@ file.
>   |                       |
>   |                       |
>   |                       |
> - |  graph-{hash0} |
> + |  graph-{hash0}        |
>   |                       |
>   |                       |
>   |                       |