Re: [PATCH 1/1] merge-recursive: give notice when submodule commit gets fast-forwarded

2018-06-06 Thread Elijah Newren
Hi Leif, On Mon, Jun 4, 2018 at 11:48 AM, Leif Middelschulte wrote: > From: Leif Middelschulte > > Since submodules are treated similarly to ordinary files (i.e. not as 'dumb' > pointers), an automatic merge should be mentioned if the user asks for it. > Just as it is mentioned for oridnary

[PATCH 1/1] merge-recursive: give notice when submodule commit gets fast-forwarded

2018-06-04 Thread Leif Middelschulte
From: Leif Middelschulte Since submodules are treated similarly to ordinary files (i.e. not as 'dumb' pointers), an automatic merge should be mentioned if the user asks for it. Just as it is mentioned for oridnary files. Signed-off-by: Leif Middelschulte --- merge-recursive.c | 10 ++