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

Re: Commit dropped when swapping commits with rebase -i -p

From
PWPhillip Wood <phillip.wood@talktalk.net>
Date
Sep 17, 2017, 13:31 UTC
Message-ID
<71c4d0ee-bc64-0c94-7991-2cb6d0a2bfd1@talktalk.net>
In-Reply-To
<CAHGBnuMBD1kVJoFLB-apUKbKJipOW3XTGqO+5W8jesY100ZFcg@mail.gmail.com>
On 16/09/17 14:45, Sebastian Schuberth wrote:
Show 27 quoted lines
> 
> On Sat, Sep 16, 2017 at 12:41 PM, Andreas Heiduk <asheiduk@gmail.com> wrote:
> 
>> Therefore I would avoid "definitive wording" like "will drop" and use
>> vague wording along "there are various dragons out there" like this:
>>
>>      The todo list presented by `--preserve-merges --interactive` does
>>      not represent the topology of the revision graph.  Editing
> 
> I tried to avoid this introducing sentence from the original wording
> as it reads like from a scientific research paper instead of from a
> user's manual.
> 
>>      commits and rewording their commit messages should work fine.
>>      But reordering, combining or dropping commits of a complex topology
> 
> There is no need for complex topology. If you reorder the two most
> recent commits in a linear history, one gets dropped.
> 
>>      can produce unexpected and useless results like missing commits,
>>      wrong merges, merges combining two unrelated histories and
>>      similar things.
> 
> "can produce" is much too soft, IMO. Reordering commits goes wrong,
> period. Like wise "unexpected and useless results" is inappropriate.
> The results are wrong in case of reordering, and wrong results are of
> course unexpected and useless.

I agree that the wording needs to be explicit that bad things will happen. It should spell out that if commits or reordered, or the fixup or squash commands are used then commits will be dropped and if commits are deleted from the list or the drop command is used other commits other than the intended ones will be dropped as well.

Previous: Sebastian SchuberthNext: Johannes Schindelin
Message 9 of 12 in “Commit dropped when swapping commits with rebase -i -p”
  1. Sebastian SchuberthAug 30, 2017
  2. Martin ÅgrenAug 30, 2017
  3. Sebastian SchuberthAug 30, 2017
  4. Jonathan NiederSep 2, 2017
  5. Sebastian SchuberthSep 11, 2017
  6. Junio C HamanoSep 15, 2017
  7. Andreas HeidukSep 16, 2017
  8. Sebastian SchuberthSep 16, 2017
  9. Phillip WoodSep 17, 2017
  10. Johannes SchindelinAug 30, 2017
  11. Sebastian SchuberthAug 30, 2017
  12. Johannes SchindelinSep 1, 2017

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.