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

interactive rebase should better highlight the not-applying commit

From
Joshua N Pritikin <jpritikin@pobox.com>
Date
Oct 11, 2016, 19:07 UTC
Message-ID
<20161011190745.w2asu6eoromkrccu@droplet>

As of GIT 2.8.1, if you do an interactive rebase and get some conflict in the stack of patches then the commit with the conflict is buried in 4-5 lines of output. It is visually difficult to immediately pick out which commit did not apply cleanly. I suggest highlighting the 1 line commit summary in red or green or some color to help it stand out from all the other output.

I decided to suggest this change after I realized that I probably skipped a commit during an interactive rebase instead of resolving the conflict. I knew I had to skip some commit so I assumed that I just need to skip without reading the commit summary carefully. Now it is 7-15 days after I did the erroneous rebase. I had to spend a few hours today with GIT's archaeology tools to find the lost code.

I assume somebody familiar with GIT's code base could make this change in about 10 minutes.

-- 
Joshua N. Pritikin, Ph.D.
Virginia Institute for Psychiatric and Behavioral Genetics
Virginia Commonwealth University
PO Box 980126
800 E Leigh St, Biotech One, Suite 1-133
Richmond, VA 23219
http://people.virginia.edu/~jnp3bc
Next: Stefan Beller
Message 1 of 8 in “interactive rebase should better highlight the not-applying commit”
  1. Joshua N PritikinOct 11, 2016
  2. Stefan BellerOct 11, 2016
  3. Johannes SchindelinOct 12, 2016
  4. Stefan BellerOct 11, 2016
  5. Joshua N PritikinOct 12, 2016
  6. Johannes SchindelinOct 12, 2016
  7. Joshua N PritikinOct 12, 2016
  8. Johannes SchindelinOct 13, 2016

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.