* [PATCH] Tweaks to make asciidoc play nice.
@ 2006-04-05 22:25 Francis Daly
0 siblings, 0 replies; only message in thread
From: Francis Daly @ 2006-04-05 22:25 UTC (permalink / raw)
To: git; +Cc: Marco Roeland
Once the content has been generated, the formatting elves can reorder
it to be pretty...
Signed-off-by: Francis Daly <francis@daoine.org>
---
The manpage formatting needed to stop things being ugly is
nontrivial. In this case, an option has multi-paragraph content,
some of which should be displayed preformatted.
"+" means "this next paragraph is a continuation of the same section"
"--" means "the next paragraphs are all continuations -- don't worry
about all the other "+"s
"------" means "the next content is preformatted"
"------", the blank line, and the extra indentation within ------ are
there because docbook-xsl stylesheets are odd in different ways.
This combination makes the preformatted text be visually distinct
with both versions 1.68 and 1.69. Without that oddness, we could
use either just ------ or just indentation. Ho hum.
Documentation/git-commit.txt | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
e46caf57bc2d09c032b992f9024226acd2d68fbc
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index ec8b562..0a7365b 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -83,15 +83,16 @@ OPTIONS
the current tip as parents -- so the current top commit is
discarded.
+
+--
It is a rough equivalent for:
-+
-$ git reset --soft HEAD^
-+
-$ ... do something else to come up with the right tree ...
-+
-$ git commit -c ORIG_HEAD
-+
+------
+ $ git reset --soft HEAD^
+ $ ... do something else to come up with the right tree ...
+ $ git commit -c ORIG_HEAD
+
+------
but can be used to amend a merge commit.
+--
-i|--include::
Instead of committing only the files specified on the
--
1.2.4.g3488
--
Francis Daly francis@daoine.org
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2006-04-05 22:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-05 22:25 [PATCH] Tweaks to make asciidoc play nice Francis Daly
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.