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

Re: GIT 0.99.7d, and end of week status.

From
Petr Baudis <pasky@suse.cz>
Date
Sep 27, 2005, 09:51 UTC
Message-ID
<20050927095142.GB30889@pasky.or.cz>
In-Reply-To
<1127765852.5735.36.camel@cashmere.sps.mot.com>

Dear diary, on Mon, Sep 26, 2005 at 10:17:32PM CEST, I got a letter where Jon Loeliger <jdl@freescale.com> told me that...

Show 30 quoted lines
> Hmmm...  Would it make sense to introduce something
> like this instead:
> 
>     # When fetching, get bits from here:
>     URL: http://...../git.git
>     # When fetching, grab and map like this:
>     Fetch: master:origin maint:maint +pu:pu
>     # When merging, merge origin, maint and pu into master
>     Merge: master origin maint pu
> 
> With the intent that the "Fetch:" line effectively
> limits the fetching operation to git-fetch, and doesn't
> specify how to merge.  Then, the "Merge:" line specifies
> how to do the git-merge bits.  If you didn't want to
> merge in the maint and pu bits, this would have been
> the line instead:
> 
>     # Merge into master the just the origin bits
>     Merge: master origin
> 
> If you want the dual-step fetch+merge, the leave the "Pull:"
> line as originally written:
> 
>     # Fetch and merge
>     Pull: master:origin maint:maint +pu:pu
> 
> Syntax can be argued, of course.  My point being to
> introduce another line to the remote file that
> distinguishes the default behavior for each step
> along the way.

Yes, this is basically the idea behind my "Default" line, but arguably nicer and more flexible. I fully agree with Junio that pulling should merge to your current branch, but I like your idea otherwise.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.
Previous: Petr Baudis
Message 23 of 23 in “GIT 0.99.7d, and end of week status.”
  1. Junio C HamanoSep 25, 2005
  2. Alan ChandlerSep 25, 2005
  3. Junio C HamanoSep 25, 2005
  4. Alan ChandlerSep 25, 2005
  5. Junio C HamanoSep 26, 2005
  6. Alan ChandlerSep 26, 2005
  7. Junio C HamanoSep 26, 2005
  8. Tom PrinceSep 25, 2005
  9. Junio C HamanoSep 25, 2005
  10. Petr BaudisSep 26, 2005
  11. Junio C HamanoSep 26, 2005
  12. Petr BaudisSep 27, 2005
  13. Matthias UrlichsSep 29, 2005
  14. Junio C HamanoSep 29, 2005
  15. Jon LoeligerSep 26, 2005
  16. Junio C HamanoSep 26, 2005
  17. Fix default pull not to do an unintended Octopus.Junio C Hamano, Sep 27, 2005
  18. Josef WeidendorferSep 27, 2005
  19. Petr BaudisSep 27, 2005
  20. Josef WeidendorferSep 27, 2005
  21. Junio C HamanoSep 27, 2005
  22. Petr BaudisSep 27, 2005
  23. Petr BaudisSep 27, 2005

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.