Re: [RFC] Add config option corresponding to --rebase-merges

2019-08-26 Thread Dakota Hawkins
> I am not quite sure about the "cousins" thing. If at all, I would make > that a global option, I think. But then, maybe you have a use case in > mind where it would make sense to rebase cousins in some, but not in > other cases, cases that can be discerned via branch names? I wasn't sure about t

Re: [RFC] Add config option corresponding to --rebase-merges

2019-08-26 Thread Johannes Schindelin
Hi Dakota, On Fri, 23 Aug 2019, Dakota Hawkins wrote: > I'd like to work on a patch to add config options that correspond to > rebase's --rebase-merges flag. > > In my workflow, while it's uncommon to encounter merge commits during > a rebase operation, when they are encountered I pretty much alw

Re: [RFC] Add config option corresponding to --rebase-merges

2019-08-24 Thread Dakota Hawkins
I think it would also be prudent to add the following: # Auto-config option values for new branches branch.autoSetupRebase= + localCousins + remoteCousins + alwaysCousins

[RFC] Add config option corresponding to --rebase-merges

2019-08-23 Thread Dakota Hawkins
I'd like to work on a patch to add config options that correspond to rebase's --rebase-merges flag. In my workflow, while it's uncommon to encounter merge commits during a rebase operation, when they are encountered I pretty much always want this behavior. Since it's rare, I pretty much always for