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

[PATCH] Documentation: fix formatting error in merge-options.txt

From
Jack Nagel <jacknagel@gmail.com>
Date
Dec 5, 2011, 07:53 UTC
Message-ID
<1323071607-29213-1-git-send-email-jacknagel@gmail.com>

The first paragraph inside of a list item does not need a preceding line consisting of a single '+', and in fact this causes the text to be misrendered. Fix it.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Documentation/merge-options.txt |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 6bd0b04..1a5c12e 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -9,7 +9,6 @@ inspect and further tweak the merge result before committing.
 
 --edit::
 -e::
-+
 	Invoke editor before committing successful merge to further
 	edit the default merge message.
 

-- 
1.7.8
Next: Junio C Hamano
Message 1 of 2 in “Documentation: fix formatting error in merge-options.txt”
  1. Documentation: fix formatting error in merge-options.txtJack Nagel, Dec 5, 2011
  2. Junio C HamanoDec 5, 2011

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.