Merge branch 'lg/merge-signoff'
authorJunio C Hamano <gitster@pobox.com>
Thu, 24 Aug 2017 17:20:01 +0000 (10:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Aug 2017 17:20:02 +0000 (10:20 -0700)
commitbdfc15fb21328a1461191863777583d32c034077
tree7443285d2b5a32d810f2e94aa68e1cd73572f8e1
parent39566494226919aa18951f2abff6491f5547d377
parent14d01b4f07a08ee55bffc74f2d6e1b0a4e8ce900
Merge branch 'lg/merge-signoff'

"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