* [PATCH] Documentation/git-merge.txt: fix formatting of example block
@ 2013-09-05 15:12 Andreas Schwab
2013-09-05 17:51 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Andreas Schwab @ 2013-09-05 15:12 UTC (permalink / raw)
To: git
You need at least four dashes in a line to have it recognized as listing
block delimiter by asciidoc.
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
---
Documentation/git-merge.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 8c7f2f6..a74c371 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -186,11 +186,11 @@ In such a case, you can "unwrap" the tag yourself before feeding it
to `git merge`, or pass `--ff-only` when you do not have any work on
your own. e.g.
----
+----
git fetch origin
git merge v1.2.3^0
git merge --ff-only v1.2.3
----
+----
HOW CONFLICTS ARE PRESENTED
--
1.8.4
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Documentation/git-merge.txt: fix formatting of example block
2013-09-05 15:12 [PATCH] Documentation/git-merge.txt: fix formatting of example block Andreas Schwab
@ 2013-09-05 17:51 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2013-09-05 17:51 UTC (permalink / raw)
To: Andreas Schwab; +Cc: git
Thanks. It seems that this was broken from the beginning at
77c72780 (Documentation: merging a tag is a special case,
2013-03-21).
Will apply.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-09-05 17:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-05 15:12 [PATCH] Documentation/git-merge.txt: fix formatting of example block Andreas Schwab
2013-09-05 17:51 ` Junio C Hamano
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).