{"thread":{"id":"1853","subject":"Ugly merge messages","startedAt":"2005-09-19T00:05:18Z","lastAt":"2005-09-19T00:12:57Z","messageCount":2,"participants":["Linus Torvalds","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"8817","messageId":"Pine.LNX.4.58.0509181649390.9106@g5.osdl.org","threadId":"1853","inReplyTo":null,"subject":"Ugly merge messages","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2005-09-19T00:05:18Z","receivedAt":"2005-09-19T00:05:18Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\nJunio,\n your merge messages are pretty ugly.\n\nYou often merge from a local branch in the current tree, which is fine, \nbut it generates a message like\n\n\tOctopus merge of the following:\n\n\trefs/heads/pu from .\n\tbranch 'nuker' of .\n\tbranch 'merge' of .\n\nwhich just looks wrong. At least to me, the dot looks more like a \nend-of-incomplete-sentence than a source of data.\n\nAlso, the \"first\" branch is really special, since that's the branch you're \nmerging _into_. \n\nWouldn't it look a lot nicer if this read as\n\n\tOctopus merge of the following:\n\n\tbranch 'nuker'\n\tbranch 'merge'\n\tinto branch 'pu'\n\nor something?\n\nBut that still has the problem that the single-line description (ie gitk,\nshortlog etc) is totally useless. So maybe we shouldn't care about the\ndestination branch (we don't do that for normal merges), and just aim for\nsomething like\n\n\tOctopus merge of branches 'nuker', 'merge'\n\ninstead?\n\nHmm? At least for the kernel, the shortlog really is pretty important, \nbecause the full log is often so big that it's easy to miss things in it.\n\n\t\tLinus\n"},{"id":"8818","messageId":"7vd5n5zzhy.fsf@assigned-by-dhcp.cox.net","threadId":"1853","inReplyTo":"Pine.LNX.4.58.0509181649390.9106@g5.osdl.org","subject":"Re: Ugly merge messages","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-09-19T00:12:57Z","receivedAt":"2005-09-19T00:12:57Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Linus Torvalds <torvalds@osdl.org> writes:\n\n>  your merge messages are pretty ugly.\n\nSorry, I've been using what have been in \"pu\" branch for some\ntime but this time around I used what is in the master (and\n0.99.7).   Post-0.99.7 one produces a single liner for an\nOctopus.  I think it makes sense as you suggest to say just\nbranch names of what are merged when we know they come from\nlocal.\n"}]}