Re: Constant merging required

2015-03-29 Thread John Whitley
Matthias Thubauville wrote: > However I've noticed the following: > > Suppose I make modifications on two machines and commit them on both. Hi Matthias, The way I handle this is to set the "branch.master.rebase" config value to true in every vcsh managed repo, e.g.: git config branch.master

Re: Constant merging required

2015-03-29 Thread Brian May
On Mon, 30 Mar 2015 at 06:28 John Whitley wrote: > Related thought about vcsh: I've been meaning to add a "vcsh each" command > as a generalization of "vcsh {push,pull}". E.g. "vcsh each git config > branch.master.rebase true". That would be handy in cases like this where I > want to run some c

Re: Constant merging required

2015-03-29 Thread John Whitley
> On Mar 29, 2015, at 6:53 PM, Brian May wrote: > > On Mon, 30 Mar 2015 at 06:28 John Whitley > wrote: > Related thought about vcsh: I've been meaning to add a "vcsh each" command as > a generalization of "vcsh {push,pull}". E.g. "vcsh each git config > branch.ma

Re: Constant merging required

2015-03-29 Thread Richard Hartmann
On Sun, Mar 29, 2015 at 9:27 PM, John Whitley wrote: > Related thought about vcsh: I've been meaning to add a "vcsh each" command as > a generalization of "vcsh {push,pull}". E.g. "vcsh each git config > branch.master.rebase true". That would be handy in cases like this where I > want to run