Skip to content

Commit

Permalink
Tweaks to make asciidoc play nice.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Francis Daly authored and Junio C Hamano committed Apr 5, 2006
1 parent ae5d847 commit 6cbd5d7
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions Documentation/git-commit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6cbd5d7

Please sign in to comment.