aboutsummaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-24 12:45:39 -0800
committerJunio C Hamano <gitster@pobox.com>2010-11-24 12:45:39 -0800
commit6cf9bf6cbcfd57606da30710656b248651d3113f (patch)
tree1f4b76528d2049413596cba7f785094f1d9a9482 /contrib/examples/git-merge.sh
parentbe0a4c820094c72cff67b69de8ba7ce88145ce86 (diff)
parent53cad69105e524deb014fe2ddec1d5804636d182 (diff)
downloadgit-6cf9bf6cbcfd57606da30710656b248651d3113f.tar.gz
git-6cf9bf6cbcfd57606da30710656b248651d3113f.tar.xz
Merge branch 'kf/post-receive-sample-hook' into maint
* kf/post-receive-sample-hook: post-receive-email: ensure sent messages are not empty
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions