On Thu, Sep 14, 2017 at 10:57 AM, Nicolas Morey-Chaisemartin
wrote:
> Without changing your workflow too much,
If you mean to imply that you have other recommendations if I'm
willing to change my workflow, then please by all means share them.
I'm very interested. I'm
Le 14/09/2017 à 17:39, Robert Dailey a écrit :
> So I often will have a submodule that points to one of my own forks,
> because I will have work done on a feature branch that hasn't been
> merged upstream yet. Assuming this merge takes a long time to get
> approved, I will occasionally rebase my
So I often will have a submodule that points to one of my own forks,
because I will have work done on a feature branch that hasn't been
merged upstream yet. Assuming this merge takes a long time to get
approved, I will occasionally rebase my topic branch to keep things up
to date and clean.
Teach pull to optionally update submodules when '--recurse-submodules'
is provided. This will teach pull to run 'submodule update --rebase'
when the '--recurse-submodules' and '--rebase' flags are given under
specific circumstances.
On a rebase workflow:
=
1. Both sides
are a little refactoring needed for the last patch
that adds the functionality.
Thanks,
Stefan
Stefan Beller (3):
builtin/fetch: factor submodule recurse parsing out to submodule
config
builtin/fetch: parse recurse-submodules-default at default options
parsing
pull: optionally rebase
On 05/11, Stefan Beller wrote:
> On Thu, May 11, 2017 at 10:24 AM, Brandon Williams wrote:
> > Teach pull to optionally update submodules when '--recurse-submodules'
> > is provided. This will teach pull to run 'submodule update --rebase'
> > when the '--recurse-submodules'
On 05/11, Philip Oakley wrote:
> From: "Brandon Williams"
> >Teach pull to optionally update submodules when '--recurse-submodules'
> >is provided. This will teach pull to run 'submodule update --rebase'
> >when the '--recurse-submodules' and '--rebase' flags are given.
> >
>
From: "Brandon Williams"
Teach pull to optionally update submodules when '--recurse-submodules'
is provided. This will teach pull to run 'submodule update --rebase'
when the '--recurse-submodules' and '--rebase' flags are given.
Signed-off-by: Brandon Williams
On Thu, May 11, 2017 at 10:24 AM, Brandon Williams wrote:
> Teach pull to optionally update submodules when '--recurse-submodules'
> is provided. This will teach pull to run 'submodule update --rebase'
> when the '--recurse-submodules' and '--rebase' flags are given.
>
>
Teach pull to optionally update submodules when '--recurse-submodules'
is provided. This will teach pull to run 'submodule update --rebase'
when the '--recurse-submodules' and '--rebase' flags are given.
Signed-off-by: Brandon Williams
---
Pull is already a shortcut for
10 matches
Mail list logo