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

Re: [PATCH] Allow format-patch to create patches for merges

From
Jeff King <peff@peff.net>
Date
Jan 26, 2009, 20:45 UTC
Message-ID
<20090126204543.GF27604@coredump.intra.peff.net>
In-Reply-To
<d77df1110901260827j2200fe41oe1b84c387d88aba@mail.gmail.com>
On Mon, Jan 26, 2009 at 10:27:18AM -0600, Nathan W. Panike wrote:
Show 8 quoted lines
> I think I have an unusual workflow where my patch makes sense,
> although it probably does not for the vast majority of git users.  I
> regularly use 3 machines: S, L, and H.  I keep my work synchronized by
> using git.  Normally, I fetch from S to L or to H, depending on which
> machine I am working on at the moment.  I also push from L or H to S.
> I sporadically lose connectivity to S, so I have a hook in the repo on
> S to send a backup email to me on mail server M, which has a more
> reliable connection.  This email also serves as a  reminder when I

Have you considered sending a bundle instead of a patch in the backup email? That is the more exact equivalent of a push (i.e., it preserves your actual commits, sha1 and all).

-Peff
Previous: Nathan W. PanikeNext: Nathan W. Panike
Message 4 of 6 in “Allow format-patch to create patches for merges”
  1. Allow format-patch to create patches for mergesNathan W. Panike, Jan 26, 2009
  2. Johannes SchindelinJan 26, 2009
  3. Nathan W. PanikeJan 26, 2009
  4. Jeff KingJan 26, 2009
  5. Nathan W. PanikeJan 26, 2009
  6. Junio C HamanoJan 26, 2009

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.