From: Jeff King Date: Tue, 03 Mar 2009 15:40:41 GMT Subject: [PATCH] doc: clarify how -S works Message-ID: <20090303154041.GA31265@coredump.intra.peff.net> In-Reply-To: <20090303152333.GB24593@coredump.intra.peff.net> The existing text was very vague about what exactly it means for difference to "contain" a change. This seems to cause confusion on the mailing list every month or two. To fix it we: 1. use "introduce or remove an instance of" instead of "contain" 2. point the user to gitdiffcore(7), which contains a more complete explanation Signed-off-by: Jeff King --- I wonder if "gitdiffcore" is a little scary for new people who just want to use "-S", but hopefully point (1) above will get rid of most of the confusion, and those who follow the link want to learn all about diff. Documentation/diff-options.txt | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 813a7b1..9276fae 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -176,7 +176,10 @@ override configuration settings. number. -S:: - Look for differences that contain the change in . + Look for differences that introduce or remove an instance of + . 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 -- 1.6.2.rc2.330.gba39e