X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-commit.txt;h=0fe66f2d0c84003d285fed426181998063e86b96;hb=ada7781dc3602e6efc052e5e0da37a63caae0489;hp=2af472a5691007296ffb3a3c0921ab27e23e3884;hpb=ae5d8470f6b8e1abdef19bf033472c63fb72b735;p=git.git diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 2af472a5..0fe66f2d 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -83,21 +83,22 @@ 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 command line, update them in the index file and then commit the whole index. This is the traditional - behaviour. + behavior. -o|--only:: Commit only the files specified on the command line. @@ -105,7 +106,7 @@ but can be used to amend a merge commit. index and the latest commit does not match on the specified paths to avoid confusion. ---:: +\--:: Do not interpret any more arguments as options. ...::