Merge branch 'maint-1.6.1' into maint

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 813a7b11b99d51d3014f854770384ed4fc247c9f..9276faeb11aec2650393c56fe5edf2b571692dbd 100644 (file)
--- 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