Tweaks to make asciidoc play nice.

Once the content has been generated, the formatting elves can reorder
it to be pretty...

Signed-off-by: Francis Daly <francis@daoine.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Francis Daly 2006-04-05 23:25:17 +01:00 committed by Junio C Hamano
parent ae5d8470f6
commit 6cbd5d7d79

View File

@ -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
------------
+
------
but can be used to amend a merge commit.
--
-i|--include::
Instead of committing only the files specified on the