summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-06 21:53:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-06 21:53:12 (GMT)
commitf0798e6cdbf99515391242e20f8df495a14e9c22 (patch)
treede83eeb548197f6c2493a48a617b0f47e4d39a79 /git-mergetool.sh
parent578e6021c0819d7be1179e05e7ce0e6fdb2a01b7 (diff)
parent353d84c537485500989b190c5af93ad224264e2c (diff)
downloadgit-f0798e6cdbf99515391242e20f8df495a14e9c22.zip
git-f0798e6cdbf99515391242e20f8df495a14e9c22.tar.gz
git-f0798e6cdbf99515391242e20f8df495a14e9c22.tar.bz2
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 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions