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

Re: I want "fast forward my workdir to upstream if it's safe"

From
Miles Bader <miles@gnu.org>
Date
May 8, 2009, 21:34 UTC
Message-ID
<87iqkbth1c.fsf@catnip.gol.com>
In-Reply-To
<F871F2A1-DFCF-4642-BB53-7BE483A93271@orakel.ntnu.no>
Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no> writes:
> I read it as a request for pull/merge --ff-only (based on "abort if the
> workdir is dirty or is not a fast-forward update").  This feature  has
> been implemented twice, but never included:
I'd also like such a feature.

[It seems like such an obvious partner to "--no-ff" (etc), that it's kind of surprising it isn't there already -- I think there have been multiple times in the past where I've spent time grovelling the pull/merge documentation looking for the right option name to do this, only to give up in confusion when I couldn't find it...]

-Miles
-- 
Love is the difficult realization that something other than oneself is real.
[Iris Murdoch]
Previous: Eyvind Bernhardsen
Message 12 of 12 in “I want "fast forward my workdir to upstream if it's safe"”
  1. Randal L. SchwartzMay 7, 2009
  2. Wincent ColaiutaMay 7, 2009
  3. Randal L. SchwartzMay 7, 2009
  4. Jeff KingMay 8, 2009
  5. Andreas EricssonMay 8, 2009
  6. Jeff KingMay 8, 2009
  7. Eyvind BernhardsenMay 8, 2009
  8. Randal L. SchwartzMay 8, 2009
  9. Junio C HamanoMay 8, 2009
  10. Jakub NarebskiMay 8, 2009
  11. Eyvind BernhardsenMay 11, 2009
  12. Miles BaderMay 8, 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.