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

Re: git bug? + question

From
SBSanti Béjar <sbejar@gmail.com>
Date
Nov 3, 2006, 10:27 UTC
Message-ID
<8aa486160611030227w4c79ace9ta00a3eecfc46b11a@mail.gmail.com>
In-Reply-To
<20061103095905.GD7545@admingilde.org>
On 11/3/06, Martin Waitz <tali@admingilde.org> wrote:
> I think the most intuitive thing for pull would be to fetch into
> remotes/<remotename>/* and then to merge
> remotes/<remotename>/<currentbranch>.

Yes as the default branch to merge instead the first line, the problem is that it changes the current behaviour. But I think the most intuitive thing would be to record the branch it is based off at the branch creation time. Something similar to my patch:

Oct 17 [PATCHv2] git-branch: Set branch properties
Message-ID: <87y7rf80es.fsf@gmail.com>
Note that it is for the "old" git-branch.sh.
Previous: Martin WaitzNext: Linus Torvalds
Message 15 of 38 in “git bug? + question”
  1. Miles BaderNov 2, 2006
  2. Junio C HamanoNov 3, 2006
  3. SeanNov 3, 2006
  4. Karl HasselströmNov 3, 2006
  5. Junio C HamanoNov 3, 2006
  6. Andy ParkinsNov 3, 2006
  7. Junio C HamanoNov 3, 2006
  8. Karl HasselströmNov 3, 2006
  9. Josef WeidendorferNov 3, 2006
  10. Jakub NarebskiNov 3, 2006
  11. Josef WeidendorferNov 3, 2006
  12. Junio C HamanoNov 4, 2006
  13. Josef WeidendorferNov 4, 2006
  14. Martin WaitzNov 3, 2006
  15. Santi BéjarNov 3, 2006
  16. Linus TorvaldsNov 3, 2006
  17. Junio C HamanoNov 3, 2006
  18. Andy ParkinsNov 3, 2006
  19. Karl HasselströmNov 3, 2006
  20. SeanNov 3, 2006
  21. Karl HasselströmNov 3, 2006
  22. Shawn PearceNov 3, 2006
  23. SeanNov 3, 2006
  24. Jeff KingNov 3, 2006
  25. Shawn PearceNov 4, 2006
  26. Shawn PearceNov 3, 2006
  27. SeanNov 3, 2006
  28. Junio C HamanoNov 4, 2006
  29. SeanNov 4, 2006
  30. Shawn PearceNov 4, 2006
  31. Josef WeidendorferNov 4, 2006
  32. Shawn PearceNov 4, 2006
  33. Josef WeidendorferNov 6, 2006
  34. Andy WhitcroftNov 6, 2006
  35. Josef WeidendorferNov 6, 2006
  36. Andy WhitcroftNov 6, 2006
  37. Shawn PearceNov 4, 2006
  38. Shawn PearceNov 4, 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.