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

Re: [PATCH] Documentation: update git-pull.txt for clone's new default behavior

From: Jakub Narebski <hidden>
Date: 2016-06-15 22:42:47

Junio C Hamano wrote:
Luben Tuikov [off-list ref] writes:
quoted
Questions:

What is the reasonining of defining branch.<name>.merge to point
to the "remote's setup"?
See list archives.  

Because you are not required to use remote tracking branches.
By the way, I think we allow the name of the remote tracking
branch as well, but we do not advertise it -- always using
remote's name consistently is much less confusing.
If  remember correctly there were added some magic which makes
git search on pull first remote branches (to allow to pull
without tracking branches), then tracking branches. This I think
supercedes alternate proposal of using branch.<name>.mergeLocal.

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help