{"thread":{"id":"26590","subject":"[RFD] Line spacing in git log for merge commits with --oneline","startedAt":"2011-02-24T09:41:44Z","lastAt":"2011-02-24T09:41:44Z","messageCount":1,"participants":["Michael J Gruber"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"162118","messageId":"4D6627D8.2030208@drmicha.warpmail.net","threadId":"26590","inReplyTo":null,"subject":"[RFD] Line spacing in git log for merge commits with --oneline","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-24T09:41:44Z","receivedAt":"2011-02-24T09:41:44Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Currently, displaying, say, origin/next@{1}..origin/next with\ngit log --graph --abbrev-commit --oneline\nproduces something like:\n\n*   426d48d Merge branch 'lp/config-vername-check' into next\n|\\\n| * 2169ddc Disallow empty section and variable names\n| * b09c53a Sanity-check config variable names\n*   58b03b1 Merge branch 'jc/grep--no-index-pathspec-fix' into next\n|\\\n| * 9d8b831 grep --no-index: honor pathspecs correctly\n*   b5c25fa Merge branch 'jh/push-default-upstream-configname' into next\n|\\\n| * 53c4031 push.default: Rename 'tracking' to 'upstream'\n...\n\nWhat bothers me is that visually, the description at the merge points\nsticks to the commits above (look at 58b03b1,b5c25fa), whereas logically\nit belongs to the block below.\n\nNow, I don't know what the best solution would be that doesn't bother\nanyone else. (Also, I have no clue about the --graph code.) Maybe there\nis one already that I don't know of? Also, I haven't looked at fork\npoints. I'm putting two fake solutions below.\n\nMichael\n\nExtra lines before each merge (needs more space):\n\n*   426d48d Merge branch 'lp/config-vername-check' into next\n|\\\n| * 2169ddc Disallow empty section and variable names\n| * b09c53a Sanity-check config variable names\n|\n*   58b03b1 Merge branch 'jc/grep--no-index-pathspec-fix' into next\n|\\\n| * 9d8b831 grep --no-index: honor pathspecs correctly\n|\n*   b5c25fa Merge branch 'jh/push-default-upstream-configname' into next\n|\\\n| * 53c4031 push.default: Rename 'tracking' to 'upstream'\n...\n\nDenser display (may break with \"%w(..)\" and what not?):\n\n*\\  426d48d Merge branch 'lp/config-vername-check' into next\n| * 2169ddc Disallow empty section and variable names\n| * b09c53a Sanity-check config variable names\n*\\  58b03b1 Merge branch 'jc/grep--no-index-pathspec-fix' into next\n| * 9d8b831 grep --no-index: honor pathspecs correctly\n*\\  b5c25fa Merge branch 'jh/push-default-upstream-configname' into next\n| * 53c4031 push.default: Rename 'tracking' to 'upstream'\n...\n\n*\\\n| * is suboptimal, maybe there are better solutions, like\n\n*\n|`*\n\nand/or marking a merge commit with '+'.\n"}]}