From: Junio C Hamano Date: Wed, 5 Apr 2006 23:08:03 +0000 (+0000) Subject: Autogenerated HTML docs for v1.3.0-rc2-g6cbd5 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=47ea30e85eb01718d47adb2ef1ae073295cdcc7d;p=git.git Autogenerated HTML docs for v1.3.0-rc2-g6cbd5 --- diff --git a/git-commit.html b/git-commit.html index 08d93db4..ff315aaa 100644 --- a/git-commit.html +++ b/git-commit.html @@ -399,7 +399,8 @@ information.

        $ git reset --soft HEAD^
         $ ... do something else to come up with the right tree ...
-        $ git commit -c ORIG_HEAD
+ $ git commit -c ORIG_HEAD +

but can be used to amend a merge commit.

@@ -506,7 +507,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index 2af472a5..0a7365b9 100644 --- a/git-commit.txt +++ b/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