git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-30 06:58:55 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge branch 'ad/blame-diff-algorithm' into next

Browse Source 
"git blame" learns "--diff-algorithm=<algo>" option.

* ad/blame-diff-algorithm:
  blame: make diff algorithm configurable
  xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK
This commit is contained in:
Junio C Hamano
2025-11-19 10:58:45 -08:00
parent 53d94af6b4 ffffb987fc
commit e1e456469f
9 changed files with 279 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
diff.c
View File

@@ -3530,7 +3530,6 @@ static int set_diff_algorithm(struct diff_options *opts,
return -1;
/* clear out previous settings */
DIFF_XDL_CLR(opts, NEED_MINIMAL);
opts->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
opts->xdl_opts |= value;