{"thread":{"id":"6576","subject":"How to enhance merge commit message ?","startedAt":"2007-01-30T04:32:24Z","lastAt":"2007-01-30T05:23:59Z","messageCount":3,"participants":["Alexander Litvinov","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"33001","messageId":"200701301032.24917.litvinov2004@gmail.com","threadId":"6576","inReplyTo":null,"subject":"How to enhance merge commit message ?","fromName":"Alexander Litvinov","fromEmail":"litvinov2004@gmail.com","sentAt":"2007-01-30T04:32:24Z","receivedAt":"2007-01-30T04:32:24Z","isPatch":false,"sender":{"key":"litvinov2004@gmail.com","avatar":null},"body":"Hello list,\n\ngit's git repo contains a lot of merges with nice commit message, \nlike this (d96497b8d):\n\nMerge branches 'jc/merge-base', 'sp/merge', 'jc/diff', 'jc/explain', 'jc/web' \nand 'jc/pickaxe' into pu\n    \n    * jc/merge-base:\n      Teach \"git-merge-base --check-ancestry\" about refs.\n      git-merge-base: --check-ancestry option\n    \n    * sp/merge:\n      Avoid git-fetch in `git-pull .` when possible.\n    \n    * jc/diff:\n      test-para: combined diff between HEAD, index and working tree.\n      para-walk: walk n trees, index and working tree in parallel\n    \n    * jc/explain:\n      git-explain\n....\n\nHow can I made the same messages using git pull . <branch> ?\n"},{"id":"33002","messageId":"7v8xfl6s27.fsf@assigned-by-dhcp.cox.net","threadId":"6576","inReplyTo":"200701301032.24917.litvinov2004@gmail.com","subject":"Re: How to enhance merge commit message ?","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-01-30T04:45:36Z","receivedAt":"2007-01-30T04:45:36Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alexander Litvinov <litvinov2004@gmail.com> writes:\n\n> git's git repo contains a lot of merges with nice commit message, \n> like this (d96497b8d):\n> ....\n> How can I made the same messages using git pull . <branch> ?\n\n$ grep -A2 '^merge\\.summary' Documentation/config.txt\nmerge.summary::\n\tWhether to include summaries of merged commits in newly created\n\tmerge commit messages. False by default.\n\nThis is a good option if you are doing the top-level \"bundling\nof others' work -- people will base their further work on this\"\nmerges.  On the other hand, if you are merging from your uplevel\nbecause your work depends on something that was updated recently,\nhaving the merge summary is often pointless (because the merge\nwould bring in many mostly unrelated commits, in addition to that\nsomething your work depends on).  I think Linus has explicitly\nasked this option not enabled by people he pulls from for this\nreason.\n\nWe might want to have a per-branch option to control this\nbehaviour at finer grained level.  I would enable it for my four\nprimary integration branches (maint, master, next, and pu) but\nnot for topic branches.  That way, if a topic needs a fix that\nhappened on the master since it forked, the tip of the master\nwill be merged back to the topic without the merge summary\nmessage (I would describe why that merge in an unusual direction\nwas needed in the commit message anyway).\n"},{"id":"33003","messageId":"200701301123.59687.litvinov2004@gmail.com","threadId":"6576","inReplyTo":"7v8xfl6s27.fsf@assigned-by-dhcp.cox.net","subject":"Re: How to enhance merge commit message ?","fromName":"Alexander Litvinov","fromEmail":"litvinov2004@gmail.com","sentAt":"2007-01-30T05:23:59Z","receivedAt":"2007-01-30T05:23:59Z","isPatch":false,"sender":{"key":"litvinov2004@gmail.com","avatar":null},"body":"В сообщении от Tuesday 30 January 2007 10:45 Junio C Hamano написал(a):\n> $ grep -A2 '^merge\\.summary' Documentation/config.txt\n> merge.summary::\n> \tWhether to include summaries of merged commits in newly created\n> \tmerge commit messages. False by default.\nThanks !\n\n> This is a good option if you are doing the top-level \"bundling\n> of others' work -- people will base their further work on this\"\n> merges.  On the other hand, if you are merging from your uplevel\n> because your work depends on something that was updated recently,\n> having the merge summary is often pointless (because the merge\n> would bring in many mostly unrelated commits, in addition to that\n> something your work depends on).  I think Linus has explicitly\n> asked this option not enabled by people he pulls from for this\n> reason.\nI understand your point.\n"}]}