summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-11-07 11:55:40 -0800
committerJunio C Hamano <gitster@pobox.com>2014-11-07 11:57:57 -0800
commitd956a20a69bc5aca954994ba0a33338ec5b1cc99 (patch)
tree3eaa1c9c8753358308687317298f4f05097aeea0 /Documentation
parentf174a2583c9f42315b60205890fa67a79a1f1669 (diff)
downloadgit-d956a20a69bc5aca954994ba0a33338ec5b1cc99.tar.gz
Documentation/git-commit: clarify that --only/--include records the working tree contentsjc/doc-commit-only
With the original phrasing, it is possible to misunderstand as if the contents in the index for only the specified paths are made into the new commit. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-commit.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 5cc84a1391..a157c6883a 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -211,9 +211,10 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
-o::
--only::
- Make a commit only from the paths specified on the
+ Make a commit by taking the updated working tree contents
+ of the paths specified on the
command line, disregarding any contents that have been
- staged so far. This is the default mode of operation of
+ staged for other paths. This is the default mode of operation of
'git commit' if any paths are given on the command line,
in which case this option can be omitted.
If this option is specified together with '--amend', then