{"thread":{"id":"3805","subject":"[PATCH] Tweaks to make asciidoc play nice.","startedAt":"2006-04-05T22:25:17Z","lastAt":"2006-04-05T22:25:17Z","messageCount":1,"participants":["Francis Daly"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"18406","messageId":"20060405222517.GA4202@craic.sysops.org","threadId":"3805","inReplyTo":null,"subject":"[PATCH] Tweaks to make asciidoc play nice.","fromName":"Francis Daly","fromEmail":"francis@daoine.org","sentAt":"2006-04-05T22:25:17Z","receivedAt":"2006-04-05T22:25:17Z","isPatch":true,"sender":{"key":"francis@daoine.org","avatar":null},"body":"Once the content has been generated, the formatting elves can reorder\nit to be pretty...\n\nSigned-off-by: Francis Daly <francis@daoine.org>\n\n---\n\nThe manpage formatting needed to stop things being ugly is\nnontrivial. In this case, an option has multi-paragraph content,\nsome of which should be displayed preformatted.\n\n\"+\" means \"this next paragraph is a continuation of the same section\"\n\"--\" means \"the next paragraphs are all continuations -- don't worry\n     about all the other \"+\"s\n\"------\" means \"the next content is preformatted\"\n\"------\", the blank line, and the extra indentation within ------ are \n     there because docbook-xsl stylesheets are odd in different ways.\n     This combination makes the preformatted text be visually distinct \n     with both versions 1.68 and 1.69. Without that oddness, we could\n     use either just ------ or just indentation. Ho hum.\n\n Documentation/git-commit.txt |   15 ++++++++-------\n 1 files changed, 8 insertions(+), 7 deletions(-)\n\ne46caf57bc2d09c032b992f9024226acd2d68fbc\ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex ec8b562..0a7365b 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -83,15 +83,16 @@ OPTIONS\n \tthe current tip as parents -- so the current top commit is\n \tdiscarded.\n +\n+--\n It is a rough equivalent for:\n-+\n-$ git reset --soft HEAD^\n-+\n-$ ... do something else to come up with the right tree ...\n-+\n-$ git commit -c ORIG_HEAD\n-+\n+------\n+\t$ git reset --soft HEAD^\n+\t$ ... do something else to come up with the right tree ...\n+\t$ git commit -c ORIG_HEAD\n+\n+------\n but can be used to amend a merge commit.\n+--\n \n -i|--include::\n \tInstead of committing only the files specified on the\n-- \n1.2.4.g3488\n\n-- \nFrancis Daly        francis@daoine.org\n"}]}