Thread (7 messages) flat view 7 messages, 3 authors, 2016-06-15

Re: [PATCH] Per branch properties for pull and fetch

From: Martin Waitz <hidden>
Date: 2016-06-15 22:42:34

hoi :)

On Thu, Jul 27, 2006 at 10:14:45AM +0200, Santi Béjar wrote:
It allows to specify on a per branch basis the following:
.- default repository to fetch
.- default branches to merge on a per repository basis
.- default pull.{octopus,twohead}

So if you have this in the config:
[branch "my"]
	remote=yours
	merge=master
	merge=our from theirs
	merge=mine from .
could we default the to-be-merged branch to "remotes/$remote/$branch" if
that exists?. That could make life a lot easier when using
clone --use-separate-remote.

-- 
Martin Waitz

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help