Re: defaults for where to merge from

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: defaults for where to merge from

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:57

"Alex Riesen" [off-list ref] writes:
quoted
If everyone hated the old behavior, old users should already be careful
about not git-pull'ing (without options) from any branch but master.  So
they won't see any difference.
except for .git/config growing uncontrollably
I think this should be a new option, not the _modified default_.
Otherwise it would be harder to sell to olde timers.

	$ git checkout -B <newbranch> remotes/<blah>
        $ git branch --track <newbranch> remotes/<blah>

might be a good compromise.

Re: defaults for where to merge from

From: J. Bruce Fields <hidden>
Date: 2016-06-15 22:42:57

On Thu, Mar 01, 2007 at 12:18:58AM -0800, Junio C Hamano wrote:
"Alex Riesen" [off-list ref] writes:
quoted
quoted
If everyone hated the old behavior, old users should already be careful
about not git-pull'ing (without options) from any branch but master.  So
they won't see any difference.
except for .git/config growing uncontrollably
I think this should be a new option, not the _modified default_.
Otherwise it would be harder to sell to olde timers.

	$ git checkout -B <newbranch> remotes/<blah>
        $ git branch --track <newbranch> remotes/<blah>

might be a good compromise.
Personally I usually use <blah> as <newbranch>.  I might have gone for
something like

	git remote checkout [remote] blah [-b newbranch]

with defaulted to newbranch = blah.

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