Merge branch 'maint'

* maint: Documentation: clarify effects of -- <path> arguments
git-mirror · Aug 30, 2011 · 4b5eac7 · 4b5eac7
2 parents 826603d + b15b5b1
commit 4b5eac7
Showing 1 changed file with 7 additions and 4 deletions.
diff --git 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[]