diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-10-28 19:01:15 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-10-28 19:01:15 +0300 |
commit | e2f1d2c3179cae92c9502d10c13e25624726caa2 (patch) | |
tree | 0cec7d96d2e092be075b2cb43c684b1bc9d19129 /Documentation | |
parent | 839b993f1f2a36e9e7511e4c279e4218c2127ed3 (diff) | |
parent | 7431596ab1f05a13adb93b44108f27cfd6578a31 (diff) |
Merge branch 'nd/commit-p-doc' into maint
Documentation for "git commit" was updated to clarify that "commit
-p <paths>" adds to the current contents of the index to come up
with what to commit.
* nd/commit-p-doc:
git-commit.txt: clarify --patch mode with pathspec
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-commit.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index b0a294d3b5..f2ab0ee2e7 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -29,7 +29,8 @@ The content to be added can be specified in several ways: 2. by using 'git rm' to remove files from the working tree and the index, again before using the 'commit' command; -3. by listing files as arguments to the 'commit' command, in which +3. by listing files as arguments to the 'commit' command + (without --interactive or --patch switch), in which case the commit will ignore changes staged in the index, and instead record the current content of the listed files (which must already be known to Git); @@ -41,7 +42,8 @@ The content to be added can be specified in several ways: actual commit; 5. by using the --interactive or --patch switches with the 'commit' command - to decide one by one which files or hunks should be part of the commit, + to decide one by one which files or hunks should be part of the commit + in addition to contents in the index, before finalizing the operation. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate these modes. |