Merge branch 'lg/merge-signoff' into next
authorJunio C Hamano <gitster@pobox.com>
Sun, 20 Aug 2017 06:07:13 +0000 (23:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 Aug 2017 06:07:13 +0000 (23:07 -0700)
commitcb53d7b026b0098f0635625f447ef196cfb2d9ff
tree5556f78146898ea33ba63ae610d38da530df1aee
parenta239d031bc070103de1627bcc2d87e01a6942186
parent14d01b4f07a08ee55bffc74f2d6e1b0a4e8ce900
Merge branch 'lg/merge-signoff' into next

"git merge" learned a "--signoff" option to add the Signed-off-by:
trailer with the committer's name.

* lg/merge-signoff:
  merge: add a --signoff flag
builtin/merge.c