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
Jakub Narebski <jnareb@gmail.com>
Date
May 8, 2009, 16:15 UTC
Message-ID
<m3prejmv2f.fsf@localhost.localdomain>
In-Reply-To
<7vk54rvb8x.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 9 quoted lines
> 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:
> 
> Interesting.  Do you mean twice they were both found lacking, substandard,
> useless, uninteresting, buggy, incorrect, or all of the above?  Or was it
> just somebody simply forgot to apply a perfect patchset twice?

I think (if I remember correctly) that they were once to be split into just --ff-only and --ff=<strategy>, and once there were almost ready, and either feature freeze happened, or the author didn't have time to resend corrected patches, or both.

I cc-ed authors of both versions (longer by Sverre, only --ff-only by Yuval)

-- 
Jakub Narebski
Poland
ShadeHawk on #git
Previous: Junio C HamanoNext: Eyvind Bernhardsen
Message 10 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.