Merge branch 'rs/code-cleaning'
commit1fc83452c76e65385b3da69ea94eb957e36e6c78
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:33:09 +0000 (16 11:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:33:09 +0000 (16 11:33 -0700)
tree6d6105b9a9fed643036df3d0fceabde1ab1479c7
parentf357797678aa5ae35c63623b8b76eb682d5b9b79
parent9d02150cf4d833935161ef265e4dc03807caa800
Merge branch 'rs/code-cleaning'

* 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
commit.c
merge-recursive.c
pretty.c
rerere.c