My Various Git Projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f0f493e e228c17)
Merge branch 'js/lift-parent-count-limit'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Jan 2014 18:33:36 +0000 (10:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Jan 2014 18:33:36 +0000 (10:33 -0800)
commit3b9d69ec22b8821fecc44c07ea49adc749484335
tree89993616989d8d5a43cbcf5a39ac651c70a2272ftree | snapshot
parentf0f493ec58489c739839e8d257a04159889639c6commit | diff
parente228c1736f25c59cd6da51ed97e03ecd80a935e6commit | diff
Merge branch 'js/lift-parent-count-limit'

There is no reason to have a hardcoded upper limit of the number of
parents for an octopus merge, created via the graft mechanism.

* js/lift-parent-count-limit:
  Remove the line length limit for graft files
builtin/blame.c diff1 | diff2 | blob | history
commit.c diff1 | diff2 | blob | history
The core git plumbing