git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ee5788e e228c17)
Merge branch 'js/lift-parent-count-limit' into maint
authorJunio C Hamano <redacted>
Wed, 5 Feb 2014 22:03:01 +0000 (14:03 -0800)
committerJunio C Hamano <redacted>
Wed, 5 Feb 2014 22:03:01 +0000 (14:03 -0800)
commit3c864743a68a81b5a15bbd92afcea74470c1bc2f
treec36b51250e9ca8a6d55a77a10d297a8090477a91tree | snapshot
parentee5788e306a69933eeb5472e68fd6c4c7105d9efcommit | diff
parente228c1736f25c59cd6da51ed97e03ecd80a935e6commit | diff
Merge branch 'js/lift-parent-count-limit' into maint

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

* js/lift-parent-count-limit:
  Remove the line length limit for graft files
git clone https://git.99rst.org/PROJECT