author | Junio C Hamano <gitster@pobox.com> | |
Thu, 22 Dec 2011 19:27:31 +0000 (11:27 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 22 Dec 2011 19:27:31 +0000 (11:27 -0800) | ||
commit | 1aea303d7eafc5f178b253f4d069eb5f2acfb409 | |
tree | c4db1a26a5f63f8820e26e408163dac8dbe56763 | tree | snapshot |
parent | 339aff0846ccf21905d047c20e3c7d077d6f300b | commit | diff |
parent | 03f94ae9f909952ed5a78917ab319a312889354b | commit | diff |
Merge branch 'jk/maint-strbuf-missing-init'
* 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 | | blob | history |
builtin/merge.c | diff1 | | diff2 | | blob | history |