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

how to reorder commits

From
RMRustom Mody <rustompmody@gmail.com>
Date
Jul 20, 2009, 15:07 UTC
Message-ID
<f46c52560907200807heed4bbfkde15cccd2ae8151d@mail.gmail.com>

I have a sequence of commits. I tried to reorder the top two in this way. $ git rebase -i HEAD^^

flip the two pick lines and exit vi

I find my file full of conflict markers. So what is the way of doing: HEAD becomes current HEAD^ HEAD^ becomes current HEAD without having to handle conflicts ??

Next: Santi Béjar
Message 1 of 6 in “how to reorder commits”
  1. Rustom ModyJul 20, 2009
  2. Santi BéjarJul 20, 2009
  3. Rustom ModyJul 20, 2009
  4. Santi BéjarJul 20, 2009
  5. Daniel BarkalowJul 20, 2009
  6. Rustom ModyJul 21, 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.