{"thread":{"id":"3605","subject":"git-fmt-merge-msg cleanup","startedAt":"2006-03-09T01:56:07Z","lastAt":"2006-03-09T02:27:51Z","messageCount":2,"participants":["Linus Torvalds","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"17352","messageId":"Pine.LNX.4.64.0603081753270.32577@g5.osdl.org","threadId":"3605","inReplyTo":null,"subject":"git-fmt-merge-msg cleanup","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2006-03-09T01:56:07Z","receivedAt":"2006-03-09T01:56:07Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\nSince I've started using the \"merge.summary\" flag in my repo, my merge \nmessages look nicer, but I dislike how I get notifications of merges \nwithin merges.\n\nSo I'd suggest this trivial change..\n\nSigned-off-by: Linus Torvalds <torvalds@osdl.org>\n----\ndiff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl\nindex dae383f..afe80e6 100755\n--- a/git-fmt-merge-msg.perl\n+++ b/git-fmt-merge-msg.perl\n@@ -47,7 +47,7 @@ sub current_branch {\n sub shortlog {\n \tmy ($tip) = @_;\n \tmy @result;\n-\tforeach ( qx{git-log --topo-order --pretty=oneline $tip ^HEAD} ) {\n+\tforeach ( qx{git-log --no-merges --topo-order --pretty=oneline $tip ^HEAD} ) {\n \t\ts/^[0-9a-f]{40}\\s+//;\n \t\tpush @result, $_;\n \t}\n"},{"id":"17353","messageId":"7vzmk0fj2w.fsf@assigned-by-dhcp.cox.net","threadId":"3605","inReplyTo":"Pine.LNX.4.64.0603081753270.32577@g5.osdl.org","subject":"Re: git-fmt-merge-msg cleanup","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-03-09T02:27:51Z","receivedAt":"2006-03-09T02:27:51Z","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> Since I've started using the \"merge.summary\" flag in my repo, my merge \n> messages look nicer, but I dislike how I get notifications of merges \n> within merges.\n>\n> So I'd suggest this trivial change..\n\nMakes sense.  Thanks.\n"}]}