Re: Now What?
From: Josef Weidendorfer <hidden>
Date: 2016-06-15 22:42:10
On Thursday 03 November 2005 23:07, Junio C Hamano wrote:
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