Eric Blake wrote:
> On 01/20/2011 02:56 AM, Jim Meyering wrote:
>> However, I now see that is not always adequate:
>> "git syncsub" did not do what I expected, and I did
>> not rerun "make public-submodule-commit" to verify.
>> It still fails.
>
> Can you configure branch.master.rebase = true in your gnulib submodule
> to avoid creating merge commits?
Thanks.
I'll try that.
> Meanwhile, I've just modified my ~/.gitconfig to alter my syncsub alias
> to make it more apparent to me if this situation happens:
>
> [alias]
> syncsub = git submodule foreach git --ff-only origin master
>
> Note the addition of --ff-only.
You must mean this (i.e., don't remove the "pull"):
syncsub = git submodule foreach git pull --ff-only origin master
