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)
"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

1  2 
builtin/merge.c

diff --cc builtin/merge.c
Simple merge