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

Re: [RFC/PATCH 5/6] revert: add --ff option to allow fast forward when cherry-picking

From
Christian Couder <christian.couder@gmail.com>
Date
Feb 1, 2010, 12:43 UTC
Message-ID
<c07716ae1002010443p4e0443feke14e5f877584640f@mail.gmail.com>
In-Reply-To
<4B66B68C.7050505@gnu.org>
On Mon, Feb 1, 2010 at 12:10 PM, Paolo Bonzini <bonzini@gnu.org> wrote:
>> +               OPT_BOOLEAN(0, "ff",&ff_ok, "allow fast forward"),
>
> Why should this not be the default?

Maybe it could be the default, but in this case it should be made compatible with -n option (and perhaps other options) for backward compatibility, and this would probably need more involved changes.

Thanks, Christian.

Show 13 quoted lines
> Instead, you'd add --no-ff.  This would
> simplify 6/6 further, like
>
>  eval sha1=\$$#
>  ...
>  output git cherry-pick "$@"
>
> Paolo
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
Previous: Paolo BonziniNext: Paolo Bonzini
Message 10 of 14 in “add --ff option to cherry-pick”
  1. 0/6 add --ff option to cherry-pickChristian Couder, Feb 1, 2010
  2. 1/6 revert: libify cherry-pick and revert functionnalityChristian Couder, Feb 1, 2010
  3. Johannes SchindelinFeb 1, 2010
  4. Stephen BoydFeb 3, 2010
  5. 2/6 reset: refactor updating heads into a static functionChristian Couder, Feb 1, 2010
  6. 3/6 reset: refactor reseting in its own functionChristian Couder, Feb 1, 2010
  7. 4/6 reset: make reset function non static and declare it in "reset.h"Christian Couder, Feb 1, 2010
  8. 5/6 revert: add --ff option to allow fast forward when cherry-pickingChristian Couder, Feb 1, 2010
  9. Paolo BonziniFeb 1, 2010
  10. Christian CouderFeb 1, 2010
  11. Paolo BonziniFeb 1, 2010
  12. Christian CouderFeb 2, 2010
  13. Paolo BonziniFeb 2, 2010
  14. 6/6 rebase -i: use new --ff cherry-pick optionChristian Couder, Feb 1, 2010

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.