On Tue, Oct 11, 2016 at 12:07 PM, Joshua N Pritikin <jpriti...@pobox.com> wrote: > 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. >
Looking at the actual code, this is not as easy as one might assume, because rebase is written in shell. (One of the last remaining large commands in shell), and there is no color support in the die(..) function. However IIUC currently rebase is completely rewritten/ported to C where it is easier to add color support as we do have some color support in there already.