diff options
| -rw-r--r-- | Documentation/git-commit.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 2af472a..0a7365b 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 |