Re: [PATCH 1/1] Warn about fast-forwarding of submodules during merge

2018-05-10 Thread Leif Middelschulte
Hi Stefan, Am 10. Mai 2018 um 20:49:39, Stefan Beller (sbel...@google.com(mailto:sbel...@google.com)) schrieb: > On Thu, May 10, 2018 at 11:26 AM, Leif Middelschulte > wrote: > > From: Leif Middelschulte > > Hi Leif! > > thanks for following up with a patch! sure, thanks for the quick review. >

Re: [PATCH 1/1] Warn about fast-forwarding of submodules during merge

2018-05-10 Thread Stefan Beller
On Thu, May 10, 2018 at 11:26 AM, Leif Middelschulte wrote: > From: Leif Middelschulte Hi Leif! thanks for following up with a patch! > Warn the user about an automatically fast-forwarded submodule. The silent > merge > behavior was introduced by commit 68d03e4a6e44 ("Implement automatic > f

[PATCH 1/1] Warn about fast-forwarding of submodules during merge

2018-05-10 Thread Leif Middelschulte
From: Leif Middelschulte Warn 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 --- submodule.c | 2 ++ 1 file chan