git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: defaults for where to merge from

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Feb 28, 2007, 15:46 UTC
Message-ID
<Pine.LNX.4.63.0702281643200.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<Pine.LNX.4.64.0702281526270.15314@reaper.quantumfyre.co.uk>
Hi,
On Wed, 28 Feb 2007, Julian Phillips wrote:
Show 22 quoted lines
> On Wed, 28 Feb 2007, Andy Parkins wrote:
> 
> > On Wednesday 2007 February 28 14:53, Paolo Bonzini wrote:
> > > As can be seen from my other messages, I'm experimenting a little with
> > > git and trying to understand how its workflow compares with arch.  Right
> > > now, my procedure for branching off a remote archive is:
> > > 
> > >    git checkout -b branchname remote/upstreambranch
> > >    git config --add branch.branchname.remote remote
> > >    git config --add branch.branchname.merge refs/heads/upstreambranch
> > > 
> > > Is there a reason why "git branch" and "git checkout -b" should not
> > > automatically do the two "git-config --add"s when the source branch is
> > > remote?
> > 
> > I can see why that would be handy, but I often make short lived 
> > branches off a remote; and I wouldn't want my config cluttered up with 
> > branch defintions.
> 
> How about adding an option to tell checkout/branch that a tracking 
> branch is wanted (-t perhaps) - or perhaps a way to say that you don't 
> want to track the remote (depending on which is more popular)?

I don't think that you should be forced to do it explicitely. If you want to merge in another branch, you can do that _explicitely_. So, defaulting to what most people want anyway is A Good Thing.

Just my 2 cents, Dscho

Previous: Julian PhillipsNext: Paolo Bonzini
Message 7 of 48 in “defaults for where to merge from”
  1. Paolo BonziniFeb 28, 2007
  2. Johannes SchindelinFeb 28, 2007
  3. Andy ParkinsFeb 28, 2007
  4. Paolo BonziniFeb 28, 2007
  5. Andy ParkinsFeb 28, 2007
  6. Julian PhillipsFeb 28, 2007
  7. Johannes SchindelinFeb 28, 2007
  8. Paolo BonziniFeb 28, 2007
  9. Johannes SchindelinFeb 28, 2007
  10. defaults for where to merge from (take 2)Paolo Bonzini, Mar 1, 2007
  11. Alex RiesenFeb 28, 2007
  12. Paolo BonziniFeb 28, 2007
  13. Alex RiesenMar 1, 2007
  14. Johannes SchindelinMar 1, 2007
  15. Alex RiesenMar 1, 2007
  16. Paolo BonziniMar 1, 2007
  17. Alex RiesenMar 1, 2007
  18. Junio C HamanoMar 1, 2007
  19. J. Bruce FieldsMar 2, 2007
  20. Paolo BonziniMar 1, 2007
  21. Alex RiesenMar 1, 2007
  22. Paolo BonziniMar 1, 2007
  23. Alex RiesenMar 1, 2007
  24. defaults for where to merge from (take 3)Paolo Bonzini, Mar 1, 2007
  25. Alex RiesenMar 1, 2007
  26. Paolo BonziniMar 1, 2007
  27. Junio C HamanoMar 1, 2007
  28. Alex RiesenMar 1, 2007
  29. Junio C HamanoMar 2, 2007
  30. Alex RiesenMar 2, 2007
  31. Junio C HamanoMar 2, 2007
  32. Alex RiesenMar 1, 2007
  33. Paolo BonziniMar 1, 2007
  34. Johannes SchindelinMar 1, 2007
  35. Paolo BonziniMar 2, 2007
  36. git-branch: register where to merge from, when branching off a remote branchPaolo Bonzini, Mar 2, 2007
  37. Junio C HamanoMar 2, 2007
  38. Junio C HamanoMar 2, 2007
  39. Jeff KingMar 2, 2007
  40. Paolo BonziniMar 2, 2007
  41. Jeff KingMar 2, 2007
  42. Paolo BonziniMar 2, 2007
  43. Johannes SchindelinMar 2, 2007
  44. Paolo BonziniMar 2, 2007
  45. Johannes SchindelinMar 2, 2007
  46. Johannes SchindelinMar 2, 2007
  47. Jakub NarebskiMar 2, 2007
  48. Peter BaumannFeb 28, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.