From: Joshua N Pritikin <jpritikin@pobox.com>
To: git@vger.kernel.org
Subject: interactive rebase should better highlight the not-applying commit
Date: Tue, 11 Oct 2016 15:07:45 -0400 [thread overview]
Message-ID: <20161011190745.w2asu6eoromkrccu@droplet> (raw)
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 reply other threads:[~2016-10-11 19:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-11 19:07 Joshua N Pritikin [this message]
2016-10-11 20:55 ` interactive rebase should better highlight the not-applying commit Stefan Beller
2016-10-12 16:14 ` Johannes Schindelin
2016-10-11 21:25 ` Stefan Beller
2016-10-12 13:27 ` Joshua N Pritikin
2016-10-12 16:24 ` Johannes Schindelin
2016-10-12 17:02 ` Joshua N Pritikin
2016-10-13 10:40 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161011190745.w2asu6eoromkrccu@droplet \
--to=jpritikin@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).