diff options
| author | Leif Middelschulte <Leif.Middelschulte@gmail.com> | 2018-05-17 21:40:08 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-18 01:59:13 +0300 |
| commit | 76f421259718f5f504558e97dfb99e16c9ceb7c6 (patch) | |
| tree | 945b6bc8416b27cce602329fc4e45d39d42a97ac /submodule.h | |
| parent | 325f3a8e077c1992a3cc6ff957811e3154edc554 (diff) | |
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>
Diffstat (limited to 'submodule.h')
0 files changed, 0 insertions, 0 deletions