[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [coreutils] Re: gnulib/coreutils: Error on coreutils git submodule u
|
From: |
Eric Blake |
|
Subject: |
Re: [coreutils] Re: gnulib/coreutils: Error on coreutils git submodule update |
|
Date: |
Thu, 20 Jan 2011 09:05:47 -0700 |
|
User-agent: |
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101209 Fedora/3.1.7-0.35.b3pre.fc14 Lightning/1.0b3pre Mnenhy/0.8.3 Thunderbird/3.1.7 |
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?
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.
--
Eric Blake address@hidden +1-801-349-2682
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature