* [PATCH] docs: commit-graph: fix some whitespace in the diagram
@ 2020-08-13 14:50 Johannes Berg
2020-08-13 16:50 ` Derrick Stolee
2020-08-13 18:30 ` Junio C Hamano
0 siblings, 2 replies; 3+ messages in thread
From: Johannes Berg @ 2020-08-13 14:50 UTC (permalink / raw)
To: git
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] docs: commit-graph: fix some whitespace in the diagram
2020-08-13 14:50 [PATCH] docs: commit-graph: fix some whitespace in the diagram Johannes Berg
@ 2020-08-13 16:50 ` Derrick Stolee
2020-08-13 18:30 ` Junio C Hamano
1 sibling, 0 replies; 3+ messages in thread
From: Derrick Stolee @ 2020-08-13 16:50 UTC (permalink / raw)
To: Johannes Berg, git
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
> +---------------------+
> | |
> +-----------------------+ +---------------------+
> - | graph-{hash2} |->| |
> + | graph-{hash2} |->| |
> +-----------------------+ +---------------------+
> | | |
> +-----------------------+ +---------------------+
> | | | |
> - | graph-{hash1} |->| |
> + | graph-{hash1} |->| |
> | | | |
> +-----------------------+ +---------------------+
> | tmp_graphXXX
> @@ -223,7 +223,7 @@ file.
> | |
> | |
> | |
> - | graph-{hash0} |
> + | graph-{hash0} |
> | |
> | |
> | |
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] docs: commit-graph: fix some whitespace in the diagram
2020-08-13 14:50 [PATCH] docs: commit-graph: fix some whitespace in the diagram Johannes Berg
2020-08-13 16:50 ` Derrick Stolee
@ 2020-08-13 18:30 ` Junio C Hamano
1 sibling, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2020-08-13 18:30 UTC (permalink / raw)
To: Johannes Berg; +Cc: git
Johannes Berg <johannes@sipsolutions.net> writes:
> 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.
>
> 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} |
> | |
> | |
> | |
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-13 18:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-13 14:50 [PATCH] docs: commit-graph: fix some whitespace in the diagram Johannes Berg
2020-08-13 16:50 ` Derrick Stolee
2020-08-13 18:30 ` Junio C Hamano
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).