git/diff.c, branch v2.16.2

Merge branch 'cc/skip-to-optional-val'

2017-12-28T22:08:46Z

Introduce a helper to simplify code to parse a common pattern that expects either "--key" or "--key=". * cc/skip-to-optional-val: t4045: reindent to make helpers readable diff: add tests for --relative without optional prefix value diff: use skip_to_optional_arg_default() in parsing --relative diff: use skip_to_optional_arg_default() diff: use skip_to_optional_arg() index-pack: use skip_to_optional_arg() git-compat-util: introduce skip_to_optional_arg()

Merge branch 'ar/unconfuse-three-dots'

2017-12-19T19:33:58Z

Ancient part of codebase still shows dots after an abbreviated object name just to show that it is not a full object name, but these ellipses are confusing to people who newly discovered Git who are used to seeing abbreviated object names and find them confusing with the range syntax. * ar/unconfuse-three-dots: t2020: test variations that matter t4013: test new output from diff --abbrev --raw diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value t4013: prepare for upcoming "diff --raw --abbrev" output format change checkout: describe_detached_head: remove ellipsis after committish print_sha1_ellipsis: introduce helper Documentation: user-manual: limit usage of ellipsis Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").

Merge branch 'jt/diff-anchored-patience'

2017-12-19T19:33:56Z

"git diff" learned a variant of the "--patience" algorithm, to which the user can specify which 'unique' line to be used as anchoring points. * jt/diff-anchored-patience: diff: support anchoring line(s)

Merge branch 'en/rename-progress'

2017-12-19T19:33:55Z

Historically, the diff machinery for rename detection had a hardcoded limit of 32k paths; this is being lifted to allow users trade cycles with a (possibly) easier to read result. * en/rename-progress: diffcore-rename: make diff-tree -l0 mean -l sequencer: show rename progress during cherry picks diff: remove silent clamp of renameLimit progress: fix progress meters when dealing with lots of work sequencer: warn when internal merge may be suboptimal due to renameLimit

diff: use skip_to_optional_arg_default() in parsing --relative

2017-12-12T00:10:12Z

Helped-by: Jacob Keller Helped-by: Jeff King Signed-off-by: Junio C Hamano

diff: use skip_to_optional_arg_default()

2017-12-12T00:10:12Z

Let's simplify diff option parsing using skip_to_optional_arg_default(). Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

diff: use skip_to_optional_arg()

2017-12-12T00:10:12Z

Let's simplify diff option parsing using skip_to_optional_arg(). Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value

2017-12-06T15:32:59Z

Neither Git nor the user are in need of this (visual) aid anymore, but we must offer a transition period. A follow-up patch (series) will rectify the situation by covering the new output format as well as the backward compatible one. Also, fix a typo: "abbbreviated" ---> "abbreviated". Signed-off-by: Ann T Ropea Signed-off-by: Junio C Hamano

diff: support anchoring line(s)

2017-11-28T01:40:04Z

Teach diff a new algorithm, one that attempts to prevent user-specified lines from appearing as a deletion or addition in the end result. The end user can use this by specifying "--anchored=" one or more times when using Git commands like "diff" and "show". Signed-off-by: Jonathan Tan Signed-off-by: Junio C Hamano

Merge branch 'jc/ignore-cr-at-eol'

2017-11-27T02:06:31Z

The "diff" family of commands learned to ignore differences in carriage return at the end of line. * jc/ignore-cr-at-eol: diff: --ignore-cr-at-eol xdiff: reassign xpparm_t.flags bits