Merge branch 'jk/tag-sort'

* jk/tag-sort:
tag: support configuring --sort via .gitconfig
tag: fix --sort tests to use cat<<-\EOF format

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin/tag.c
Simple merge