From: Daniel Barkalow <barkalow@iabervon.org>
Date: Fri, 29 Feb 2008 22:58:15 GMT
Subject: Re: Which freedesktop.org "design flaws" in git are still relevant?
Message-ID: <alpine.LNX.1.00.0802291743330.19665@iabervon.org>
In-Reply-To: <76718490802291440x60896c93i26d8d0c2cf5678b2@mail.gmail.com>

On Fri, 29 Feb 2008, Jay Soffian wrote:

> On Fri, Feb 29, 2008 at 4:58 PM, Daniel Barkalow <barkalow@iabervon.org> wrote:
> 
> > I wonder if it would be nice to have per-branch aliases, so that you
> > could have "git update" do whatever is appropriate to update this
> > particular branch, whether it be "git pull --no-commit" or "git reset
> > --hard origin/next && git merge" or "git rebase".
> 
> Well, you effectively have this via
> branch.*.{merge,mergeoptions,rebase,remote}. e.g.:
> 
> To effect fetch + non-committing merge:
> 
>   branch.<name>.remote        = origin
>   branch.<name>.merge         = refs/heads/<name>
>   branch.<name>.mergeoptions  = --no-commit
> 
> To effect fetch + rebasing:
> 
>   branch.<name>.remote        = origin
>   branch.<name>.merge         = refs/heads/<name>
>   branch.<name>.rebase        = true

Ah, good point. I'd forgotten mergeoptions.

> To effect reset --hard origin/next, add another fetch line to your
> remote. e.g.:
> 
>   [remote "origin"]
>     url = git://git.kernel.org/pub/scm/git/git.git
>     fetch = +refs/heads/*:refs/remotes/origin/*
>     fetch = refs/heads/pu:/refs/heads/pu-readonly

This case is actually tougher. I've got:

[branch "good-stuff"]
	remote = .
	merge = refs/heads/<local topic I like>
	merge = refs/heads/<another topic>
	merge = refs/heads/<yet another>

This branch is my local equivalent of "pu" for my own topics, which gets 
next + each topic I have in a testable state (by way of an octopus merge). 
So I reset to origin/next and merge a lot of local branches.

	-Daniel
*This .sig left intentionally blank*