From: Junio C Hamano Date: Mon, 18 Jun 2018 17:18:41 +0000 (-0700) Subject: Merge branch 'rd/diff-options-typofix' X-Git-Tag: v2.18.0~22 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d676cc512a7aa17f6c7db53792c1e21c4ddfea42?ds=inline;hp=-c Merge branch 'rd/diff-options-typofix' Typofix. * rd/diff-options-typofix: diff-options.txt: fix minor typos, font inconsistencies, in docs --- d676cc512a7aa17f6c7db53792c1e21c4ddfea42 diff --combined Documentation/diff-options.txt index f466600972,6c7a56c5e9..30aad8396d --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@@ -64,7 -64,7 +64,7 @@@ ifndef::git-format-patch[ endif::git-format-patch[] --indent-heuristic:: - Enable the heuristic that shift diff hunk boundaries to make patches + Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default. --no-indent-heuristic:: @@@ -80,16 -80,6 +80,16 @@@ --histogram:: Generate a diff using the "histogram diff" algorithm. +--anchored=:: + Generate a diff using the "anchored diff" algorithm. ++ +This option may be specified more than once. ++ +If a line exists in both the source and destination, exists only once, +and starts with this text, this algorithm attempts to prevent it from +appearing as a deletion or addition in the output. It uses the "patience +diff" algorithm internally. + --diff-algorithm={patience|minimal|histogram|myers}:: Choose a diff algorithm. The variants are as follows: + @@@ -106,7 -96,7 +106,7 @@@ low-occurrence common elements". -- + - For instance, if you configured diff.algorithm variable to a + For instance, if you configured the `diff.algorithm` variable to a non-default value and want to use the default one, then you have to use `--diff-algorithm=default` option. @@@ -128,14 -118,6 +128,14 @@@ These parameters can also be set individually with `--stat-width=`, `--stat-name-width=` and `--stat-count=`. +--compact-summary:: + Output a condensed summary of extended header information such + as file creations or deletions ("new" or "gone", optionally "+l" + if it's a symlink) and mode changes ("+x" or "-x" for adding + or removing executable bit respectively) in diffstat. The + information is put betwen the filename part and the graph + part. Implies `--stat`. + --numstat:: Similar to `--stat`, but shows number of added and deleted lines in decimal notation and pathname without @@@ -350,7 -332,7 +350,7 @@@ ifndef::git-format-patch[ Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including - lines that solely consist of whitespaces) and a space character + lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible @@@ -364,7 -346,7 +364,7 @@@ this option is not given, and the configuration variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new` lines are highlighted. The whitespace errors are colored - whith `color.diff.whitespace`. + with `color.diff.whitespace`. endif::git-format-patch[] @@@ -477,12 -459,6 +477,12 @@@ ifndef::git-format-patch[ + Also, these upper-case letters can be downcased to exclude. E.g. `--diff-filter=ad` excludes added and deleted paths. ++ +Note that not all diffs can feature all types. For instance, diffs +from the index to the working tree can never have Added entries +(because the set of paths included in the diff is limited by what is in +the index). Similarly, copied and renamed entries cannot appear if +detection for those types is disabled. -S:: Look for differences that change the number of occurrences of @@@ -516,15 -492,6 +516,15 @@@ occurrences of that string did not chan See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information. +--find-object=:: + Look for differences that change the number of occurrences of + the specified object. Similar to `-S`, just the argument is different + in that it doesn't search for a specific string but for a specific + object id. ++ +The object can be a blob or a submodule commit. It implies the `-t` option in +`git-log` to also find trees. + --pickaxe-all:: When `-S` or `-G` finds a change, show all the changes in that changeset, not just the files that contain the change @@@ -533,7 -500,6 +533,7 @@@ --pickaxe-regex:: Treat the given to `-S` as an extended POSIX regular expression to match. + endif::git-format-patch[] -O:: @@@ -568,7 -534,7 +568,7 @@@ the normal order -- + Patterns have the same syntax and semantics as patterns used for -fnmantch(3) without the FNM_PATHNAME flag, except a pathname also +fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern "`foo*bar`" matches "`fooasdfbar`" and "`foo/bar/baz/asdf`" but not "`foobarx`". @@@ -591,9 -557,6 +591,9 @@@ endif::git-format-patch[ --text:: Treat all files as text. +--ignore-cr-at-eol:: + Ignore carriage-return at the end of line when doing a comparison. + --ignore-space-at-eol:: Ignore changes in whitespace at EOL.