git/Documentation/diff-options.txt, branch v2.30.2

Merge branch 'pb/blame-funcname-range-userdiff'

2020-11-18T21:32:53Z

"git blame -L :funcname -- path" did not work well for a path for which a userdiff driver is defined. * pb/blame-funcname-range-userdiff: blame: simplify 'setup_blame_bloom_data' interface blame: simplify 'setup_scoreboard' interface blame: enable funcname blaming with userdiff driver line-log: mention both modes in 'blame' and 'log' short help doc: add more pointers to gitattributes(5) for userdiff blame-options.txt: also mention 'funcname' in '-L' description doc: line-range: improve formatting doc: log, gitk: move '-L' description to 'line-range-options.txt'

Merge branch 'jc/abbrev-doc'

2020-11-11T21:18:38Z

The documentation on the "--abbrev=" option did not say the output may be longer than "" hexdigits, which has been clarified. * jc/abbrev-doc: doc: clarify that --abbrev= is about the minimum length

Merge branch 'so/format-patch-doc-on-default-diff-format'

2020-11-11T21:18:37Z

Docfix. * so/format-patch-doc-on-default-diff-format: doc/diff-options: fix out of place mentions of '--patch/-p'

doc: clarify that --abbrev= is about the minimum length

2020-11-04T22:04:44Z

Early text written in 2006 explains the "--abbrev=" option to "show only a partial prefix", without saying that the length of the partial prefix is not necessarily the number given to the option to ensure that the output names the object uniquely. Update documentation for the diff family of commands, "blame", "branch --verbose", "ls-files" and "ls-tree" to stress that the short prefix must uniquely refer to an object, and is merely the mininum number of hexdigits used in the prefix. Helped-by: Derrick Stolee Signed-off-by: Junio C Hamano

Merge branch 'mk/diff-ignore-regex'

2020-11-02T21:17:44Z

"git diff" family of commands learned the "-I" option to ignore hunks whose changed lines all match the given pattern. * mk/diff-ignore-regex: diff: add -I that ignores matching changes merge-base, xdiff: zero out xpparam_t structures

doc: add more pointers to gitattributes(5) for userdiff

2020-11-01T23:54:14Z

Several Git commands can make use of the builtin userdiff patterns, but it's not obvious in the documentation. Add pointers to the 'Defining a custom hunk header' part of gitattributes(5) in the description of the following options: - the '--function-context' option of `git diff` and friends - the '--function-context' option of `git grep` - the '-L :' option of `git log`, `gitk` and `git blame` In 'git-grep.txt', take the opportunity to use backticks in the description of '--show-function', and improve the wording of the desription of '--function-context'. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano

doc/diff-options: fix out of place mentions of '--patch/-p'

2020-10-31T20:14:26Z

First, references to --patch and -p appeared in the description of git-format-patch, where the options themselves are not included. Next, the description of --unified option elsewhere had duplicate implied statements: "Implies --patch. Implies -p." Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff: add -I that ignores matching changes

2020-10-20T19:53:26Z

Add a new diff option that enables ignoring changes whose all lines (changed, removed, and added) match a given regular expression. This is similar to the -I/--ignore-matching-lines option in standalone diff utilities and can be used e.g. to ignore changes which only affect code comments or to look for unrelated changes in commits containing a large number of automatically applied modifications (e.g. a tree-wide string replacement). The difference between -G/-S and the new -I option is that the latter filters output on a per-change basis. Use the 'ignore' field of xdchange_t for marking a change as ignored or not. Since the same field is used by --ignore-blank-lines, identical hunk emitting rules apply for --ignore-blank-lines and -I. These two options can also be used together in the same git invocation (they are complementary to each other). Rename xdl_mark_ignorable() to xdl_mark_ignorable_lines(), to indicate that it is logically a "sibling" of xdl_mark_ignorable_regex() rather than its "parent". Signed-off-by: Michał Kępień Signed-off-by: Junio C Hamano

Merge branch 'dd/diff-customize-index-line-abbrev'

2020-08-31T22:49:46Z

The output from the "diff" family of the commands had abbreviated object names of blobs involved in the patch, but its length was not affected by the --abbrev option. Now it is. * dd/diff-customize-index-line-abbrev: diff: index-line: respect --abbrev in object's name t4013: improve diff-post-processor logic

diff: index-line: respect --abbrev in object's name

2020-08-21T19:43:05Z

A handful of Git's commands respect `--abbrev' for customizing length of abbreviation of object names. For diff-family, Git supports 2 different options for 2 different purposes, `--full-index' for showing diff-patch object's name in full, and `--abbrev' to customize the length of object names in diff-raw and diff-tree header lines, without any options to customise the length of object names in diff-patch format. When working with diff-patch format, we only have two options, either full index, or default abbrev length. Although, that behaviour is documented, it doesn't stop users from trying to use `--abbrev' with the hope of customising diff-patch's objects' name's abbreviation. Let's allow the blob object names shown on the "index" line to be abbreviated to arbitrary length given via the "--abbrev" option. To preserve backward compatibility with old script that specify both `--full-index' and `--abbrev', always show full object id if `--full-index' is specified. Signed-off-by: Đoàn Trần Công Danh Signed-off-by: Junio C Hamano