diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:38:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:38:09 -0700 |
| commit | 054d949ffb2e3aa98a97c564dc9c260e7fbab033 (patch) | |
| tree | 6d6fa1c2dba634a775b74458bf9c1ebeeaebac87 /xdiff | |
| parent | 845351c99b0ae6ed96d1acb56dbf0e668c9abd9c (diff) | |
| parent | 46e3d17f57f90538242b7a1dde126eba59f7c5ab (diff) | |
| download | git-054d949ffb2e3aa98a97c564dc9c260e7fbab033.tar.gz git-054d949ffb2e3aa98a97c564dc9c260e7fbab033.tar.xz | |
Merge branch 'jk/add-i-diff-compact-heuristics'
"git add -i/-p" learned to honor diff.compactionHeuristic
experimental knob, so that the user can work on the same hunk split
as "git diff" output.
* jk/add-i-diff-compact-heuristics:
add--interactive: respect diff.compactionHeuristic
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions