| commit | 72fa8aed667ed64baa911c617c47d69e2e3fb997 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 20 Dec 2011 21:40:56 +0000 (20 13:40 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 20 Dec 2011 21:40:56 +0000 (20 13:40 -0800) | ||
| tree | 652f39b38b4ab7688d3ea1741077f6c5307c1b75 | treesnapshot (tar.gz zip) |
| parent | eee6eb305ee36fe0269babee12ec716f62fdaefc | commitdiff |
| parent | 03f94ae9f909952ed5a78917ab319a312889354b | commitdiff |
Merge branch 'jk/maint-strbuf-missing-init' into next
* jk/maint-strbuf-missing-init:
commit, merge: initialize static strbuf
Conflicts:
builtin/merge.c
* jk/maint-strbuf-missing-init:
commit, merge: initialize static strbuf
Conflicts:
builtin/merge.c
| builtin/commit.c | diff1 | diff2 | blobhistory |
| builtin/merge.c | diff1 | diff2 | blobhistory |