summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-17 20:25:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-17 20:25:19 (GMT)
commitaf9a70c8de7b1d45ecd0bbb1379c5c3e911a9dcd (patch)
tree1cb8629e196de6f9ab4ac1fd069b6c584f16e344
parent630e05c4f3121aa67dcb1399b62e4c3767d8be55 (diff)
parent7431596ab1f05a13adb93b44108f27cfd6578a31 (diff)
downloadgit-af9a70c8de7b1d45ecd0bbb1379c5c3e911a9dcd.zip
git-af9a70c8de7b1d45ecd0bbb1379c5c3e911a9dcd.tar.gz
git-af9a70c8de7b1d45ecd0bbb1379c5c3e911a9dcd.tar.bz2
Merge branch 'nd/commit-p-doc'
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
-rw-r--r--Documentation/git-commit.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index b0a294d..f2ab0ee 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.