summaryrefslogtreecommitdiff
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-30 12:35:51 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-30 12:35:51 -0700
commit4b5eac7f03f411f75087e0b6db23caa999624304 (patch)
tree0feea1c6825ce5b4f4658aefd69debe5952409a5 /Documentation/git-log.txt
parent826603d11813e56452dca52c9509e7a3d6a9b900 (diff)
parentb15b5b10a75e202f3f90e000925545243267cbee (diff)
downloadgit-4b5eac7f03f411f75087e0b6db23caa999624304.tar.gz
Merge branch 'maint'
* maint: Documentation: clarify effects of -- <path> arguments
Diffstat (limited to 'Documentation/git-log.txt')
-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 6c934660d7..249fc878ec 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[]