diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-20 14:31:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-20 14:31:15 -0700 |
| commit | 2d893d6822458ea15ef74e2b8be563945a6296fc (patch) | |
| tree | 0e4c99805c5d0224cd29f18d5a98dc48cadcc597 | |
| parent | de2e3b04cd70a22016561547530f980c66807641 (diff) | |
| parent | 821d56aa68c38f7390b3171092f7b8b814357194 (diff) | |
| download | git-2d893d6822458ea15ef74e2b8be563945a6296fc.tar.gz git-2d893d6822458ea15ef74e2b8be563945a6296fc.tar.xz | |
Merge branch 'maint'
* maint:
doc: clarify how -S works
| -rw-r--r-- | 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 813a7b11b..9276faeb1 100644 --- 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 |