| commit | 054d949ffb2e3aa98a97c564dc9c260e7fbab033 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Jul 2016 20:38:09 +0000 (6 13:38 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Jul 2016 20:38:09 +0000 (6 13:38 -0700) | ||
| tree | 6d6fa1c2dba634a775b74458bf9c1ebeeaebac87 | treesnapshot (tar.gz zip) |
| parent | 845351c99b0ae6ed96d1acb56dbf0e668c9abd9c | commitdiff |
| parent | 46e3d17f57f90538242b7a1dde126eba59f7c5ab | commitdiff |
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
"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