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

Re: git rebase fast-forward fails with abbreviateCommands

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 27, 2020, 21:33 UTC
Message-ID
<xmqq5zepfppt.fsf@gitster.c.googlers.com>
In-Reply-To
<a3cc46ca-824d-8cab-e333-83f51a7824ca@gmail.com>
Alban Gruin <alban.gruin@gmail.com> writes:
Show 6 quoted lines
> Three approach to fix this:
>
>  1) add an abbreviation to `noop';  this is the simplest fix, and "n" is
> not taken.
>  2) if a command has no short form, do not abbreviate it;  this is
> trivial to do, and should not break anything.
I think the second is the most sensible.  Thanks.
Previous: Alban GruinNext: Alban Gruin
Message 6 of 11 in “git rebase fast-forward fails with abbreviateCommands”
  1. Jan Alexander Steffens (heftig)Mar 27, 2020
  2. Alban GruinMar 27, 2020
  3. Elijah NewrenMar 27, 2020
  4. Jan Alexander Steffens (heftig)Mar 27, 2020
  5. Alban GruinMar 28, 2020
  6. Junio C HamanoMar 27, 2020
  7. 0/2 rebase --merge: fix fast forwarding when `rebase.abbreviateCommands' is setAlban Gruin, Mar 30, 2020
  8. 1/2 sequencer: don't abbreviate a command if it doesn't have a short formAlban Gruin, Mar 30, 2020
  9. Junio C HamanoMar 30, 2020
  10. Eric SunshineMar 30, 2020
  11. 2/2 t3432: test `--merge' with `rebase.abbreviateCommands = true', tooAlban Gruin, Mar 30, 2020

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.