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>
Francis Daly committed
Apr 5, 2006 at 23:25 UTC
6cbd5d7d79f5751828397558e7c3611b048565fb
1 file changed
+5
-4
Documentation/git-commit.txt
+5
-4
@@ -83,15 +83,16 @@ OPTIONS
83
the current tip as parents -- so the current top commit is
84
discarded.
85
+
86
+--
87
It is a rough equivalent for:
87
-+
88
-------------
88
+------
89
$ git reset --soft HEAD^
90
$ ... do something else to come up with the right tree ...
91
$ git commit -c ORIG_HEAD
92
-------------
93
-+
92
+
93
+------
94
but can be used to amend a merge commit.
95
+--
96
97
-i|--include::
98
Instead of committing only the files specified on the