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

Re: [RFC PATCH] Teach rebase to rebase even if upstream is up to date with -f

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 13, 2009, 07:15 UTC
Message-ID
<7v1vu2g64h.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<bd6139dc0902122251j24696806xb89de3e338d49cb@mail.gmail.com>
Sverre Rabbelier <srabbelier@gmail.com> writes:
Show 11 quoted lines
> On Fri, Feb 13, 2009 at 07:22, Junio C Hamano <gitster@pobox.com> wrote:
> ...
>> One more thing.  I kept saying "detect --whitespace=fix (or its synonym
>> strip)" because people can have "apply.whitespace = fix" in their
>> configuration file for use with "git am", and countermand the
>> configuration with "git rebase --whitespace=warn".  Such a usage should
>> not imply --force.
>
> Ok, so having 'apply.whitespace = fix' in your config _should_ imply
> -f, and '--whitespace=[no]warn' as commandline option should not
> affect '-f'.
Well, that is actually not quite what I meant.

The intention of the user who runs "git rebase" without an explicit option (-f nor --whitespace) with such a config is ambiguous.

But "git rebase --whitespace=fix" *is* unambiguously "I'd like to fix it", with or without a config. It should imply --force.

Similarly "git rebase --whitespace=warn" *is* unambiguously "I do not want the rebasing process to touch it, just warn, if necessary". It should not imply --force.

So I think it would be the most natural to look only at command line option --whitespace=*, and make fix/strip imply --force, without looking at config.

Previous: Sverre Rabbelier
Message 14 of 14 in “Teach rebase to rebase even if upstream is up to date with -f”
  1. Teach rebase to rebase even if upstream is up to date with -fSverre Rabbelier, Feb 12, 2009
  2. Johannes SchindelinFeb 12, 2009
  3. Sverre RabbelierFeb 12, 2009
  4. Johannes SchindelinFeb 12, 2009
  5. Sverre RabbelierFeb 12, 2009
  6. Junio C HamanoFeb 12, 2009
  7. Sverre RabbelierFeb 12, 2009
  8. Junio C HamanoFeb 12, 2009
  9. Sverre RabbelierFeb 12, 2009
  10. Junio C HamanoFeb 13, 2009
  11. Sverre RabbelierFeb 13, 2009
  12. Junio C HamanoFeb 13, 2009
  13. Sverre RabbelierFeb 13, 2009
  14. Junio C HamanoFeb 13, 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.