git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a3d54f9 e09867f)
Merge branch 'jk/diff-tree-t-fix'
authorJunio C Hamano <redacted>
Tue, 26 Aug 2014 18:16:26 +0000 (11:16 -0700)
committerJunio C Hamano <redacted>
Tue, 26 Aug 2014 18:16:26 +0000 (11:16 -0700)
commit4109c28e055dba27d73cefb956bea5e611f66ec0
tree8b323ced930a0eb5bb7912059506278f88ec36a9tree | snapshot
parenta3d54f9a1fa481727a849b8753fc9d1abafe6583commit | diff
parente09867f0605702c2d4e65b99e178cdaa215a7370commit | diff
Merge branch 'jk/diff-tree-t-fix'

Fix (rarely used) "git diff-tree -t" regression in 2.0.

* jk/diff-tree-t-fix:
  intersect_paths: respect mode in git's tree-sort
combine-diff.c diff1 | diff2 | blob | history
t/t4038-diff-combined.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT