| commit | d5a89c86b0064ac9c5f865a29a2a941438f6a07c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Jul 2014 19:28:06 +0000 (14 12:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Jul 2014 19:28:06 +0000 (14 12:28 -0700) | ||
| tree | d13c5d3c41ac33f11d1d42a3510d811d632d1de6 | treesnapshot (tar.gz zip) |
| parent | 0fbd06e888503bec99d1ccbb833aa5bf7516e9b2 | commitdiff |
| parent | 9d02150cf4d833935161ef265e4dc03807caa800 | commitdiff |
Merge branch 'rs/code-cleaning' into next
* rs/code-cleaning:
fsck: simplify fsck_commit_buffer() by using commit_list_count()
commit: use commit_list_append() instead of duplicating its code
merge: simplify merge_trivial() by using commit_list_append()
use strbuf_addch for adding single characters
use strbuf_addbuf for adding strbufs
* rs/code-cleaning:
fsck: simplify fsck_commit_buffer() by using commit_list_count()
commit: use commit_list_append() instead of duplicating its code
merge: simplify merge_trivial() by using commit_list_append()
use strbuf_addch for adding single characters
use strbuf_addbuf for adding strbufs
| builtin/merge.c | diff1 | diff2 | blobhistory |
| commit.c | diff1 | diff2 | blobhistory |
| merge-recursive.c | diff1 | diff2 | blobhistory |
| pretty.c | diff1 | diff2 | blobhistory |
| rerere.c | diff1 | diff2 | blobhistory |