git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Documenation: fmt-merge-msg: fix markup in example

From
SCStefan Christ <contact@stefanchrist.eu>
Date
Oct 28, 2016, 23:19 UTC
Message-ID
<20161028231909.GA697@sill.h.stcim.de>
In-Reply-To
<xmqq4m3w33o2.fsf@gitster.mtv.corp.google.com>
Hi, 
On Fri, Oct 28, 2016 at 08:15:57AM -0700, Junio C Hamano wrote:
Show 32 quoted lines
> Jeff King <peff@peff.net> writes:
> 
> > On Fri, Oct 28, 2016 at 12:01:26PM +0200, Stefan Christ wrote:
> >
> >> diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
> >> index 6526b17..44892c4 100644
> >> --- a/Documentation/git-fmt-merge-msg.txt
> >> +++ b/Documentation/git-fmt-merge-msg.txt
> >> @@ -60,10 +60,10 @@ merge.summary::
> >>  EXAMPLE
> >>  -------
> >>  
> >> ---
> >> +---------
> >>  $ git fetch origin master
> >>  $ git fmt-merge-msg --log <$GIT_DIR/FETCH_HEAD
> >> ---
> >> +---------
> >
> > Thanks. Asciidoc generally requires at least 4 delimiter characters to
> > open a delimited block (including a ListingBlock, which is what we want
> > here). There is one exception, "--", which is a generic OpenBlock, which
> > is just used for grouping, and not any special syntactic meaning (so
> > that's why this _didn't_ render the "--", but did render the contents
> > without line breaks).
> >
> > So looks good, modulo the typo in the subject that somebody else pointed
> > out.
> 
> Thanks, both.  I queued with a bit more enhanced log message while
> fixing the typo.
> 
I'm totally ok with these changes. Thanks.
Kind Regards,
	Stefan Christ
Previous: Junio C Hamano
Message 6 of 6 in “Documenation: fmt-merge-msg: fix markup in example”
  1. Documenation: fmt-merge-msg: fix markup in exampleStefan Christ, Oct 28, 2016
  2. Robert P. J. DayOct 28, 2016
  3. Documentation: fmt-merge-msg: fix markup in exampleStefan Christ, Oct 28, 2016
  4. Jeff KingOct 28, 2016
  5. Junio C HamanoOct 28, 2016
  6. Stefan ChristOct 28, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.