Re: Now What?

From: Josef Weidendorfer <josef.weidendorfer@gmx.de>
Date: Nov 3, 2005, 22:33 UTC
Message-ID: <200511032333.13823.Josef.Weidendorfer@gmx.de>
In-Reply-To: <7vll05bd1w.fsf@assigned-by-dhcp.cox.net>

On Thursday 03 November 2005 23:07, Junio C Hamano wrote:

Show 12 quoted lines

> I wonder if it would make sense to have something in .git/remotes/
> file that says "run merge only when I am on frotz branch", like
> this:
> 
>         ~/git/git-core]cat .git/remotes/origin
>         URL: git://git.kernel.org/pub/scm/git/git.git
>         Pull: master:origin
> 	Fetch-Only-Unless: master
> 
>         ~/git/git-core]git-checkout maint
> 	~/git/git-core]git pull
> 	warning: not merging because you are not on 'master' branch.

This is quite limiting, if you keep multiple branches from origin in your repository. It would be better to be able to specify per-branch Pull lines. I.e. the default pull action depends on the branch you are on.

        URL: git://git.kernel.org/pub/scm/git/git.git
        Pull(master): master:origin

        ~/git/git-core]git-checkout maint
 	~/git/git-core]git pull
 	warning: no default pull action for branch 'maint' specified

Syntax arguable.

Josef