summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2011-08-30 09:21:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-30 17:05:21 (GMT)
commitb15b5b10a75e202f3f90e000925545243267cbee (patch)
tree0b018020c1dd468585240ca098362a4b67326b7f
parentcd2b8ae983a277fb3f3c2b2c6747b0a075af1421 (diff)
downloadgit-b15b5b10a75e202f3f90e000925545243267cbee.zip
git-b15b5b10a75e202f3f90e000925545243267cbee.tar.gz
git-b15b5b10a75e202f3f90e000925545243267cbee.tar.bz2
Documentation: clarify effects of -- <path> arguments
'git log -- <path>' does not "show commits that affect the specified paths" in a literal sense unless --full-history is given (for example, a file that only existed on a side branch will turn up no commits at all!). Reword it to specify the actual intent of the filtering, and point to the "History Simplification" section. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-log.txt11
1 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 59f8be0..771a356 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -69,10 +69,13 @@ produced by --stat etc.
its size is not included.
[\--] <path>...::
- Show only commits that affect any of the specified paths. To
- prevent confusion with options and branch names, paths may need
- to be prefixed with "\-- " to separate them from options or
- refnames.
+ Show only commits that are enough to explain how the files
+ that match the specified paths came to be. See "History
+ Simplification" below for details and other simplification
+ modes.
++
+To prevent confusion with options and branch names, paths may need to
+be prefixed with "\-- " to separate them from options or refnames.
include::rev-list-options.txt[]