Merge branch 'nm/tag-edit' into next

"git tag" learned an explicit "--edit" option that allows the
message given via "-m" and "-F" to be further edited.

* nm/tag-edit:
tag: add --edit option

diff --cc builtin/tag.c
Simple merge