summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-06 14:53:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-06 14:53:12 -0700
commitf0798e6cdbf99515391242e20f8df495a14e9c22 (patch)
treede83eeb548197f6c2493a48a617b0f47e4d39a79 /merge-recursive.h
parentMerge branch 'rs/c-auto-resets-attributes' (diff)
parentcoccicheck: make transformation for strbuf_addf(sb, "...") more precise (diff)
downloadtgif-f0798e6cdbf99515391242e20f8df495a14e9c22.tar.xz
Merge branch 'rs/cocci'
Code clean-up with help from coccinelle tool continues. * rs/cocci: coccicheck: make transformation for strbuf_addf(sb, "...") more precise use strbuf_add_unique_abbrev() for adding short hashes, part 2 use strbuf_addstr() instead of strbuf_addf() with "%s", part 2 gitignore: ignore output files of coccicheck make target
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions