From: Michael J Gruber <git@drmicha.warpmail.net>
To: Git Mailing List <git@vger.kernel.org>
Subject: [RFD] Line spacing in git log for merge commits with --oneline
Date: Thu, 24 Feb 2011 10:41:44 +0100 [thread overview]
Message-ID: <4D6627D8.2030208@drmicha.warpmail.net> (raw)
Currently, displaying, say, origin/next@{1}..origin/next with
git log --graph --abbrev-commit --oneline
produces something like:
* 426d48d Merge branch 'lp/config-vername-check' into next
|\
| * 2169ddc Disallow empty section and variable names
| * b09c53a Sanity-check config variable names
* 58b03b1 Merge branch 'jc/grep--no-index-pathspec-fix' into next
|\
| * 9d8b831 grep --no-index: honor pathspecs correctly
* b5c25fa Merge branch 'jh/push-default-upstream-configname' into next
|\
| * 53c4031 push.default: Rename 'tracking' to 'upstream'
...
What bothers me is that visually, the description at the merge points
sticks to the commits above (look at 58b03b1,b5c25fa), whereas logically
it belongs to the block below.
Now, I don't know what the best solution would be that doesn't bother
anyone else. (Also, I have no clue about the --graph code.) Maybe there
is one already that I don't know of? Also, I haven't looked at fork
points. I'm putting two fake solutions below.
Michael
Extra lines before each merge (needs more space):
* 426d48d Merge branch 'lp/config-vername-check' into next
|\
| * 2169ddc Disallow empty section and variable names
| * b09c53a Sanity-check config variable names
|
* 58b03b1 Merge branch 'jc/grep--no-index-pathspec-fix' into next
|\
| * 9d8b831 grep --no-index: honor pathspecs correctly
|
* b5c25fa Merge branch 'jh/push-default-upstream-configname' into next
|\
| * 53c4031 push.default: Rename 'tracking' to 'upstream'
...
Denser display (may break with "%w(..)" and what not?):
*\ 426d48d Merge branch 'lp/config-vername-check' into next
| * 2169ddc Disallow empty section and variable names
| * b09c53a Sanity-check config variable names
*\ 58b03b1 Merge branch 'jc/grep--no-index-pathspec-fix' into next
| * 9d8b831 grep --no-index: honor pathspecs correctly
*\ b5c25fa Merge branch 'jh/push-default-upstream-configname' into next
| * 53c4031 push.default: Rename 'tracking' to 'upstream'
...
*\
| * is suboptimal, maybe there are better solutions, like
*
|`*
and/or marking a merge commit with '+'.
reply other threads:[~2011-02-24 9:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=4D6627D8.2030208@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--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).