summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-11-18 10:19:38 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-11-18 10:19:42 -0800
commit0cfd333d0bf89c0562f46a76b4ffea2a537cb01f (patch)
tree72e9fa23670e3c71ea04012ad631c601694304a7 /Documentation
parentMerge branch 'ta/tutorial-modernize' (diff)
parentDocumentation/git-commit: clarify that --only/--include records the working t... (diff)
downloadtgif-0cfd333d0bf89c0562f46a76b4ffea2a537cb01f.tar.xz
Merge branch 'jc/doc-commit-only'
* jc/doc-commit-only: Documentation/git-commit: clarify that --only/--include records the working tree contents
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 0bbc8f55f9..1e74b75d38 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -250,9 +250,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