projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c512710 f0b8fb6)
Merge branch 'jt/diff-color-move-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Sun, 20 Aug 2017 06:07:18 +0000 (23:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 Aug 2017 06:07:18 +0000 (23:07 -0700)
commit6ae3831c8c1df5e569e826b087ff5be18829124b
tree27c5d5529daa2b60eaf71ad5449a5074de42a755tree | snapshot
parentc512710fdae71056cacd513524421ba7f5f219c8commit | diff
parentf0b8fb6e591b50b72b921f2c4cf120ebd284f510commit | diff
Merge branch 'jt/diff-color-move-fix' into next

A handful of bugfixes and an improvement to "diff --color-moved".

* jt/diff-color-move-fix:
  diff: define block by number of alphanumeric chars
  diff: respect MIN_BLOCK_LENGTH for last block
  diff: avoid redundantly clearing a flag
Documentation/diff-options.txt diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.