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

Re: [PATCH] Documentation/git-rebase.txt: fix -f description to match actual git behavior.

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 15, 2014, 21:57 UTC
Message-ID
<xmqqioltza8z.fsf@gitster.dls.corp.google.com>
In-Reply-To
<87ioltik7g.fsf@osv.gnss.ru>
Sergey Organov <sorganov@gmail.com> writes:
Show 14 quoted lines
>> A sentence "--force has no effect under --preserve-merges mode" does
>> not tell the readers very much, either and leaves them wondering if
>> it means "--preserve-merges mode always rebases every time it is
>> asked, never noticing 'ah, the history is already in a good shape
>> and there is no need to do anything further'" or "--preserve-merges
>> mode ignores --force and refuses to recreate the history if the
>> history is in the shape the mode deems is already desirable."
>
> In fact there is no way to force rebase when --preserve-merges is given.
> Neither --force nor --no-ff has any effect.
>
> Maybe some clarification could be given in --preserve-merges
> description, provided it's not clear that "has no effect" for --force
> means that one can't force the rebase in this case.

I am not sure if that is an intended behaviour or simply a bug (I rarely use preserve-merges myself, so I offhand do not know for certain).

Previous: Sergey OrganovNext: Sergey Organov
Message 10 of 14 in “Documentation/git-rebase.txt: fix -f description to match actual git behavior.”
  1. Documentation/git-rebase.txt: fix -f description to match actual git behavior.Sergey Organov, Aug 11, 2014
  2. Junio C HamanoAug 12, 2014
  3. Junio C HamanoAug 12, 2014
  4. Sergey OrganovAug 13, 2014
  5. Junio C HamanoAug 13, 2014
  6. Sergey OrganovAug 18, 2014
  7. Sergey OrganovAug 15, 2014
  8. Junio C HamanoAug 15, 2014
  9. Sergey OrganovAug 15, 2014
  10. Junio C HamanoAug 15, 2014
  11. Sergey OrganovAug 18, 2014
  12. Junio C HamanoAug 18, 2014
  13. Sergey OrganovAug 19, 2014
  14. Sergey OrganovAug 19, 2014

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.