From: Francis Daly Date: Wed, 5 Apr 2006 22:25:17 +0000 (+0100) Subject: Tweaks to make asciidoc play nice. X-Git-Tag: v1.3.0-rc3~13 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=6cbd5d7d79f5751828397558e7c3611b048565fb;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 2af472a5..0a7365b9 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 ------------- -+ + +------ but can be used to amend a merge commit. +-- -i|--include:: Instead of committing only the files specified on the