Merge branch 'maint'

* maint: doc: clarify how -S works
2009-03-20 14:31:15 -07:00 · 2009-03-20 14:31:15 -07:00 · 2d893d6822
parent de2e3b04cd 821d56aa68
commit 2d893d6822
1 changed files with 4 additions and 1 deletions
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@ -176,7 +176,10 @@ override configuration settings.
 	number.

 -S<string>::
-	Look for differences that contain the change in <string>.
+	Look for differences that introduce or remove an instance of
+	<string>. Note that this is different than the string simply
+	appearing in diff output; see the 'pickaxe' entry in
+	linkgit:gitdiffcore[7] for more details.

 --pickaxe-all::
 	When -S finds a change, show all the changes in that