| commit | 3b9d69ec22b8821fecc44c07ea49adc749484335 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Jan 2014 18:33:36 +0000 (10 10:33 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Jan 2014 18:33:36 +0000 (10 10:33 -0800) | ||
| tree | 89993616989d8d5a43cbcf5a39ac651c70a2272f | treesnapshot (tar.gz zip) |
| parent | f0f493ec58489c739839e8d257a04159889639c6 | commitdiff |
| parent | e228c1736f25c59cd6da51ed97e03ecd80a935e6 | commitdiff |
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
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 | blobhistory |
| commit.c | diff1 | diff2 | blobhistory |