merge-recursive: give notice when submodule commit gets fast-forwarded
authorLeif Middelschulte <Leif.Middelschulte@gmail.com>
Thu, 17 May 2018 18:40:08 +0000 (11:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 May 2018 22:59:13 +0000 (07:59 +0900)
Inform the user about an automatically fast-forwarded submodule. The
silent merge behavior was introduced by commit 68d03e4a6e44 ("Implement
automatic fast-forward merge for submodules", 2010-07-07)).

Signed-off-by: Leif Middelschulte <Leif.Middelschulte@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found