Skip to contentSkip to conversation

branch.<name>.merge specifying remote branch name

DISCUSSION Jakub Narebski 2 participants 3 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

About the discussion about branch.<name>.merge specifying remote branch name and relative merits of specifying remote branch name (without need for tracking branch), and local branch name (which is supposedly more user friendly, and branch name specifies also remote usually)...

Perhaps it is time to resurrect branch.<name>.mergeLocal (or localMerge) idea, and both sides would be happy (well, at least when one would code it ;-).

Signature · 3 lines
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
#1 lore raw
Quoted 8 lines · Jakub Narebski

About the discussion about branch.<name>.merge specifying remote branch name and relative merits of specifying remote branch name (without need for tracking branch), and local branch name (which is supposedly more user friendly, and branch name specifies also remote usually)...

Perhaps it is time to resurrect branch.<name>.mergeLocal (or localMerge) idea, and both sides would be happy (well, at least when one would code it ;-).

Adding more and more options doesn't make it friendlier to use.

Why couldn't both names (local and remote) be accepted by branch.blah.merge?

Nicolas

#2 lore raw
Quoted 7 lines · Nicolas Pitre
Quoted 5 lines · Jakub Narebski

About the discussion about branch.<name>.merge specifying remote branch name and relative merits of specifying remote branch name (without need for tracking branch), and local branch name (which is supposedly more user friendly, and branch name specifies also remote usually)...

Quoted 8 lines
Quoted 3 lines

Perhaps it is time to resurrect branch.<name>.mergeLocal (or localMerge) idea, and both sides would be happy (well, at least when one would code it ;-).

Adding more and more options doesn't make it friendlier to use.

Why couldn't both names (local and remote) be accepted by branch.blah.merge?

Junio just implemented that. Although it is a bit of magic (which can bite when you have remote which is not '.', and which has branches with the same names like some of your local branches, and vice versa). mergeLocal would be unambiguous...

Signature · 2 lines
Jakub Narebski
Poland