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