X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=f3e95389aa5914cc05145625a5dd48bafbf086ba;hb=ec3f7d5d0f3676aa9634ee30f8c9e55893a8c505;hp=5495344e612dece0eb6cb6311864463c004f1181;hpb=6cf9bf6cbcfd57606da30710656b248651d3113f;p=git.git diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 5495344e6..f3e95389a 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -207,6 +207,7 @@ endif::git-format-patch[] digits can be specified with `--abbrev=`. -B[][/]:: +--break-rewrites[=[][/]]:: Break complete rewrite changes into pairs of delete and create. This serves two purposes: + @@ -229,6 +230,7 @@ eligible for being picked up as a possible source of a rename to another file. -M[]:: +--detect-renames[=]:: ifndef::git-log[] Detect renames. endif::git-log[] @@ -244,6 +246,7 @@ endif::git-log[] hasn't changed. -C[]:: +--detect-copies[=]:: Detect copies as well as renames. See also `--find-copies-harder`. If `n` is specified, it has the same meaning as for `-M`. @@ -282,8 +285,12 @@ ifndef::git-format-patch[] appearing in diff output; see the 'pickaxe' entry in linkgit:gitdiffcore[7] for more details. +-G:: + Look for differences whose added or removed line matches + the given . + --pickaxe-all:: - When `-S` finds a change, show all the changes in that + When `-S` or `-G` finds a change, show all the changes in that changeset, not just the files that contain the change in .