Re: [PATCH v3 0/3] Teach submodule set-branch subcommand

Denton Liu writes: > By the way, just for the record, how would you like me to handle > patchsets that cause merge conflicts? When it happens, I may ask you to rebase onto a specific commit. https://public-inbox.org/git/xmqq5ztxstkh@gitster-ct.c.googlers.com/ is a recent example. My prefere

Re: [PATCH v3 0/3] Teach submodule set-branch subcommand

On Thu, Feb 07, 2019 at 10:01:40AM -0800, Junio C Hamano wrote: > Denton Liu writes: > > > I rebased the changes onto the latest 'next' because if this branch gets > > merged into 'next', there'll be merge conflicts from > > 'dl/complete-submodule-absorbgitdirs'. > > Please don't do that. > > A

Re: [PATCH v3 0/3] Teach submodule set-branch subcommand

Denton Liu writes: > I rebased the changes onto the latest 'next' because if this branch gets > merged into 'next', there'll be merge conflicts from > 'dl/complete-submodule-absorbgitdirs'. Please don't do that. A topic that depends on everything in 'next' cannot graduate to 'master' until ever

[PATCH v3 0/3] Teach submodule set-branch subcommand

I rebased the changes onto the latest 'next' because if this branch gets merged into 'next', there'll be merge conflicts from 'dl/complete-submodule-absorbgitdirs'. Currently, there is no way to set the branch of a submodule without manually manipulating the .gitmodules file. This patchset introdu