Merge branch 'maint'

* maint: doc: clarify how -S works
git-mirror · Mar 20, 2009 · 2d893d6 · 2d893d6
2 parents de2e3b0 + 821d56a
commit 2d893d6
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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