projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ecf6778 edbc00e)
Merge branch 'jc/combine-diff-many-parents'
authorJunio C Hamano <gitster@pobox.com>
Fri, 8 Feb 2013 23:29:07 +0000 (15:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 8 Feb 2013 23:29:07 +0000 (15:29 -0800)
commit4dd7c77d19d42f6981ba4cdcda91755e5587cc28
tree0003225d8e58ad22ce7f23beb9d5c98df4518369tree | snapshot
parentecf6778e8ef243dd9b34eef57212c44baffb13a2commit | diff
parentedbc00e76d29213010db947d8d7bff3baab12a35commit | diff
Merge branch 'jc/combine-diff-many-parents'

We used to have an arbitrary 32 limit for combined diff input,
resulting in incorrect number of leading colons shown when showing
the "--raw --cc" output.

* jc/combine-diff-many-parents:
  t4038: add tests for "diff --cc --raw <trees>"
  combine-diff: lift 32-way limit of combined diff
Git—the stupid content tracker