diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:44:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:44:09 -0700 |
| commit | 52debb683198c50354c46a7745d45252b0989c7e (patch) | |
| tree | c59e853ccb7463f3a75de2de809f522ebfbfddc2 /pretty.c | |
| parent | 674d38f55b6d6b9f1cea8821f09670e07c1c7961 (diff) | |
| parent | 46e3d17f57f90538242b7a1dde126eba59f7c5ab (diff) | |
| download | git-52debb683198c50354c46a7745d45252b0989c7e.tar.gz | |
Merge branch 'jk/add-i-diff-compact-heuristics' into maint
"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 'pretty.c')
0 files changed, 0 insertions, 0 deletions