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

Re: [PATCH] Add branch.*.localmerge and documentation update

From
Jakub Narebski <jnareb@gmail.com>
Date
Dec 8, 2006, 21:48 UTC
Message-ID
<elcmen$pm6$1@sea.gmane.org>
In-Reply-To
<7vr6vagja6.fsf@assigned-by-dhcp.cox.net>
<opublikowany i wysłany>
Junio C Hamano wrote:
Show 10 quoted lines
> "Santi Béjar" <sbejar@gmail.com> writes:
> 
>> On 12/8/06, Josef Weidendorfer <Josef.Weidendorfer@gmx.de> wrote:
>>> Clarify the meaning of branch.*.merge option and add a similar
>>> branch.*.localmerge option, which can be used to specify a local
>>> tracking branch to be merged by default.
>>>
>>> Previously, if branch.*.merge was specified but did not match any
>>> ref, the message "No changes." was not really helpful regarding
>>> the misconfiguration. This now gives a warning.
[...]
Show 12 quoted lines
>>
>> Ack for the documentation part. But the localmerge part is almost
>> equivalent to my patch to allow the branch.<name>.remote equal to ".".
> 
> I am not so sure about the "localmerge" stuff anymore.
> 
> What convenience would it buy us (including but not limited to
> new people), and if there is any, would that outweigh the
> potential confusion factor to have two different configuration
> variables that do exactly the same thing whose sole difference
> is which side of the fetched branch namespace it uses to specify
> the merge source?
What about my proposal to allow for full refspec, or :<localbranch>
to be specified? I.e. allow all the following forms:
  branch.<name>.merge = refs/heads/<remotebranch>
  branch.<name>.merge = refs/heads/<remotebranch>:refs/remotes/<remote>/<localbranch>
  branch.<name>.merge = :refs/remotes/<remote>/<localbranch>

By the way, if branch.*.remote is equal to ".", remote branch is local branch.

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Previous: Junio C HamanoNext: Josef Weidendorfer
Message 20 of 36 in “git pull and merging.”
  1. Aneesh KumarDec 6, 2006
  2. Junio C HamanoDec 6, 2006
  3. Aneesh KumarDec 6, 2006
  4. Johannes SchindelinDec 6, 2006
  5. Peter BaumannDec 6, 2006
  6. Johannes SchindelinDec 6, 2006
  7. Peter BaumannDec 6, 2006
  8. Aneesh KumarDec 6, 2006
  9. Jakub NarebskiDec 6, 2006
  10. Josef WeidendorferDec 6, 2006
  11. Aneesh Kumar K.VDec 7, 2006
  12. Josef WeidendorferDec 7, 2006
  13. Junio C HamanoDec 7, 2006
  14. Josef WeidendorferDec 7, 2006
  15. Santi BéjarDec 8, 2006
  16. Josef WeidendorferDec 8, 2006
  17. Add branch.*.localmerge and documentation updateJosef Weidendorfer, Dec 8, 2006
  18. Santi BéjarDec 8, 2006
  19. Junio C HamanoDec 8, 2006
  20. Jakub NarebskiDec 8, 2006
  21. Josef WeidendorferDec 8, 2006
  22. Junio C HamanoDec 8, 2006
  23. Josef WeidendorferDec 8, 2006
  24. Junio C HamanoDec 8, 2006
  25. Add branch.*.merge warning and documentation updateJosef Weidendorfer, Dec 9, 2006
  26. Santi BéjarDec 9, 2006
  27. Josef WeidendorferDec 8, 2006
  28. Santi BéjarDec 8, 2006
  29. Santi BéjarDec 8, 2006
  30. Junio C HamanoDec 8, 2006
  31. Junio C HamanoDec 7, 2006
  32. Santi BéjarDec 8, 2006
  33. Jakub NarebskiDec 8, 2006
  34. Jakub NarebskiDec 6, 2006
  35. Johannes SchindelinDec 6, 2006
  36. Fwd: git pull and merging.Aneesh Kumar, Dec 6, 2006

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.