From: Leif Middelschulte <Leif.Middelschulte@gmail.com>
Date: Thu, 17 May 2018 18:40:08 +0000 (-0700)
Subject: merge-recursive: give notice when submodule commit gets fast-forwarded
X-Git-Tag: v2.18.0-rc0~8^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/76f421259718f5f504558e97dfb99e16c9ceb7c6?ds=inline;hp=76f421259718f5f504558e97dfb99e16c9ceb7c6

merge-recursive: give notice when submodule commit gets fast-forwarded

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