Eric Blake wrote: > On 01/04/2011 01:05 PM, Jim Meyering wrote: >>> That way, the next update of gnulib as coreutils submodule could still >>> be a fast-forward. >> >> Hi Ralf, >> >> I've done as you suggest (note that it required temporarily >> disabling the hook that prohibits pushing merge commits to master). >> That has the added benefit that the branch is no longer needed. > > Except that you --amend'ed the commit before merging, so that the > gnulib.git master branch refers to commit a77937c rather than the > intended fa6be5b that is current on the gnulib.git coreutils-8.9 branch, > so right now, one _still_ needs the coreutils-8.9 branch to exist.
sigh. Thanks, Eric. My first merge used an old, invalid branch. This one does the right thing: git merge -s ours origin/coreutils-8.9 coming up...
