{"thread":{"id":"17587","subject":"How to use git-fmt-merge-msg?","startedAt":"2009-02-05T12:31:57Z","lastAt":"2009-02-05T13:35:57Z","messageCount":4,"participants":["Robert Haines","Santi Béjar"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"103325","messageId":"84B3CCAA-A044-4517-B2C8-14D5DD754FD2@manchester.ac.uk","threadId":"17587","inReplyTo":null,"subject":"How to use git-fmt-merge-msg?","fromName":"Robert Haines","fromEmail":"rhaines@manchester.ac.uk","sentAt":"2009-02-05T12:31:57Z","receivedAt":"2009-02-05T12:31:57Z","isPatch":false,"sender":{"key":"rhaines@manchester.ac.uk","avatar":null},"body":"Hi all,\n\nI would like to use git-fmt-merge-msg to produce automatic summaries \nof what commits are being merged when I merge one branch into the \nother - like I see all the time in git.git, etc. The problem I am \nhaving is that I can only seem to get it to work with remote branches \nvia .git/FETCH_HEAD - basically I don't know what else I can feed it \nto do what I want.\n\nSay I have a local repo with no remotes so no .git/FETCH_HEAD. Can I \nuse git-fmt-merge-msg to produce such a summary when I'm just merging \nlocal branches? I've tried feeding just about everything I can find \nin .git/ into it but with no luck. Is there anything generated during \nthe merge that can be used as input if I do a merge --no-commit? A \nlist of merged commits or something?\n\nI'm sure I've missed something simple here... Alternatively, am I just \nbarking up the wrong tree?\n\nThanks,\nRob\n\n-- \nRobert Haines\n\nResearch Associate, RealityGrid Tel. : +44 (0)161 275 6067\nResearch Computing Services Fax. : +44 (0)161 275 0637\nUniversity of Manchester Email: rhaines@manchester.ac.uk\nOxford Road Web : www.realitygrid.org\nManchester, M13 9PL : www.rcs.manchester.ac.uk\n"},{"id":"103326","messageId":"adf1fd3d0902050459s4fcb914ai2b9c8c04e9f72b02@mail.gmail.com","threadId":"17587","inReplyTo":"84B3CCAA-A044-4517-B2C8-14D5DD754FD2@manchester.ac.uk","subject":"Re: How to use git-fmt-merge-msg?","fromName":"Santi Béjar","fromEmail":"santi@agolina.net","sentAt":"2009-02-05T12:59:31Z","receivedAt":"2009-02-05T12:59:31Z","isPatch":false,"sender":{"key":"santi@agolina.net","avatar":null},"body":"2009/2/5 Robert Haines :\n> Hi all,\n>\n> I would like to use git-fmt-merge-msg to produce automatic summaries of what\n> commits are being merged when I merge one branch into the other - like I see\n> all the time in git.git, etc. The problem I am having is that I can only\n> seem to get it to work with remote branches via .git/FETCH_HEAD - basically\n> I don't know what else I can feed it to do what I want.\n>\n> Say I have a local repo with no remotes so no .git/FETCH_HEAD. Can I use\n> git-fmt-merge-msg to produce such a summary when I'm just merging local\n> branches? I've tried feeding just about everything I can find in .git/ into\n> it but with no luck. Is there anything generated during the merge that can\n> be used as input if I do a merge --no-commit? A list of merged commits or\n> something?\n>\n> I'm sure I've missed something simple here...\n\nSure :-)\n\nManpage of git merge:\n --log\n In addition to branch names, populate the log message with one-line\n descriptions from the actual commits that are being merged.\n\nManpage of git config:\n merge.log\n Whether to include summaries of merged commits in newly created\n merge commit messages. False by default.\n\nHTH,\nSanti\n"},{"id":"103329","messageId":"B22C0229-47F4-48EC-9C68-63696C7BB3F2@manchester.ac.uk","threadId":"17587","inReplyTo":"adf1fd3d0902050459s4fcb914ai2b9c8c04e9f72b02@mail.gmail.com","subject":"Re: How to use git-fmt-merge-msg?","fromName":"Robert Haines","fromEmail":"rhaines@manchester.ac.uk","sentAt":"2009-02-05T13:25:32Z","receivedAt":"2009-02-05T13:25:32Z","isPatch":false,"sender":{"key":"rhaines@manchester.ac.uk","avatar":null},"body":"\nOn 5 Feb 2009, at 12:59, Santi Béjar wrote:\n\n> 2009/2/5 Robert Haines :\n>> Hi all,\n>>\n>> I would like to use git-fmt-merge-msg to produce automatic \n>> summaries of what\n>> commits are being merged when I merge one branch into the other - \n>> like I see\n>> all the time in git.git, etc. The problem I am having is that I can \n>> only\n>> seem to get it to work with remote branches via .git/FETCH_HEAD - \n>> basically\n>> I don't know what else I can feed it to do what I want.\n>>\n>> Say I have a local repo with no remotes so no .git/FETCH_HEAD. Can \n>> I use\n>> git-fmt-merge-msg to produce such a summary when I'm just merging \n>> local\n>> branches? I've tried feeding just about everything I can find \n>> in .git/ into\n>> it but with no luck. Is there anything generated during the merge \n>> that can\n>> be used as input if I do a merge --no-commit? A list of merged \n>> commits or\n>> something?\n>>\n>> I'm sure I've missed something simple here...\n>\n> Sure :-)\n>\n> Manpage of git merge:\n> --log\n> In addition to branch names, populate the log message with \n> one-line\n> descriptions from the actual commits that are being merged.\n>\n> Manpage of git config:\n> merge.log\n> Whether to include summaries of merged commits in newly \n> created\n> merge commit messages. False by default.\n\nAaaahhhh.... Time for me to upgrade. The version of git I am using \n(1.5.3.8) doesn't have merge --log. No wonder I couldn't find it!\n\nThanks for the pointer and sorry for the noise...\n\nCheers,\nRob\n"},{"id":"103331","messageId":"adf1fd3d0902050535y631035b6lfc09e0982aefdfd7@mail.gmail.com","threadId":"17587","inReplyTo":"B22C0229-47F4-48EC-9C68-63696C7BB3F2@manchester.ac.uk","subject":"Re: How to use git-fmt-merge-msg?","fromName":"Santi Béjar","fromEmail":"santi@agolina.net","sentAt":"2009-02-05T13:35:57Z","receivedAt":"2009-02-05T13:35:57Z","isPatch":false,"sender":{"key":"santi@agolina.net","avatar":null},"body":"2009/2/5 Robert Haines :\n>\n> On 5 Feb 2009, at 12:59, Santi Béjar wrote:\n>\n\n[...]\n\n>>\n>> Manpage of git merge:\n>> --log\n>> In addition to branch names, populate the log message with\n>> one-line\n>> descriptions from the actual commits that are being merged.\n>>\n>> Manpage of git config:\n>> merge.log\n>> Whether to include summaries of merged commits in newly created\n>> merge commit messages. False by default.\n>\n> Aaaahhhh.... Time for me to upgrade. The version of git I am using (1.5.3.8)\n> doesn't have merge --log. No wonder I couldn't find it!\n\nIn that version you can use --summary and merge.summary, but they are\nnow deprecated.\n\nHTH,\nSanti\n"}]}