OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
674d38f
46e3d17
)
Merge branch 'jk/add-i-diff-compact-heuristics' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 11 Jul 2016 17:44:09 +0000
(10:44 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 11 Jul 2016 17:44:09 +0000
(10:44 -0700)
"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
Trivial merge