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

Re: [PATCH] pull: abort if --ff-only is given and fast-forwarding is impossible

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 14, 2021, 17:19 UTC
Message-ID
<xmqq8s28yfsj.fsf@gitster.g>
In-Reply-To
<CABPp-BEqnTuDgC0Bb+feFj=vBB48wdb60thO+Pq3N0jL74jH8Q@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
> However, since I'm commenting on this and the stat information appears
> to be important to you, note that there are also merge.stat and
> rebase.stat configuration variables for controlling whether those are
> shown at the end of merge and rebase operations.

True. It is troubling that people try to avoid fast-forward (which is a very cheap operation) and rebase their work on top of the other side (which could unnecessarily smudge their object store with pointless replaying of the commits) only because they want to avoid the informational messages *and* there is an easy way to squelch these messages. There is some gap in documentation?

Thanks.
Previous: Elijah NewrenNext: Felipe Contreras
Message 27 of 28 in “pull: abort if --ff-only is given and fast-forwarding is impossible”
  1. pull: abort if --ff-only is given and fast-forwarding is impossibleAlex Henrie, Jul 11, 2021
  2. Felipe ContrerasJul 11, 2021
  3. Alex HenrieJul 11, 2021
  4. Felipe ContrerasJul 11, 2021
  5. Phillip WoodJul 12, 2021
  6. Felipe ContrerasJul 12, 2021
  7. Alex HenrieJul 12, 2021
  8. Felipe ContrerasJul 12, 2021
  9. Junio C HamanoJul 12, 2021
  10. Felipe ContrerasJul 12, 2021
  11. Elijah NewrenJul 12, 2021
  12. Felipe ContrerasJul 12, 2021
  13. Alex HenrieJul 12, 2021
  14. Alex HenrieJul 12, 2021
  15. Junio C HamanoJul 12, 2021
  16. Felipe ContrerasJul 12, 2021
  17. Elijah NewrenJul 12, 2021
  18. Junio C HamanoJul 12, 2021
  19. Felipe ContrerasJul 12, 2021
  20. Elijah NewrenJul 12, 2021
  21. Elijah NewrenJul 12, 2021
  22. Felipe ContrerasJul 12, 2021
  23. Phillip WoodJul 12, 2021
  24. Son Luong NgocJul 14, 2021
  25. Felipe ContrerasJul 14, 2021
  26. Elijah NewrenJul 14, 2021
  27. Junio C HamanoJul 14, 2021
  28. Felipe ContrerasJul 14, 2021

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.