Stefan Beller writes:
> From: Leif Middelschulte
>
> 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)).
Oh, another thing I forgot to mention
Stefan Beller writes:
> From: Leif Middelschulte
>
Subject: merge-recursive: give notice when submodule commit gets fast-forwarded
perhaps?
> /* Case #1: a is contained in b or vice versa */
> if (in_merge_bases(commit_a, commit_b)) {
> oidcpy(result, b);
> +
On Tue, May 15, 2018 at 1:00 PM, Stefan Beller wrote:
> From: Leif Middelschulte
>
> 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)).
>
> Sig
From: Leif Middelschulte
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
Signed-off-by: Stefan Beller
---
4 matches
Mail list logo