{"thread":{"id":"24545","subject":"Possible feature request for merge and pull","startedAt":"2010-07-28T01:24:25Z","lastAt":"2010-07-29T04:22:21Z","messageCount":10,"participants":["Bradley Wagner","Ævar Arnfjörð Bjarmason","Avery Pennarun","Jeff King","Jonathan Nieder"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"146563","messageId":"AANLkTim6JAPrSVaSaGZ72xtfFnUUcYeWT8vpL3rYuwki@mail.gmail.com","threadId":"24545","inReplyTo":null,"subject":"Possible feature request for merge and pull","fromName":"Bradley Wagner","fromEmail":"bradley.wagner@hannonhill.com","sentAt":"2010-07-28T01:24:25Z","receivedAt":"2010-07-28T01:24:25Z","isPatch":false,"sender":{"key":"bradley.wagner@hannonhill.com","avatar":"https://gravatar.com/avatar/8304e5020b13d5f8102220fae2f5dd607a2e114dbe62bbd92c1ab38fe0b69fdb?d=mp&s=160"},"body":"I would love to be able to use the -m flag and --log together with git\nmerge and pull to be able to create a custom commit message but also\ninclude one-line summaries of each of the commits being merged/pulled.\n"},{"id":"146584","messageId":"AANLkTinRvq71GS5WVdWs9zP5QSJ=TjCWBgTfRGn2Qub0@mail.gmail.com","threadId":"24545","inReplyTo":"AANLkTim6JAPrSVaSaGZ72xtfFnUUcYeWT8vpL3rYuwki@mail.gmail.com","subject":"Re: Possible feature request for merge and pull","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-07-28T07:34:54Z","receivedAt":"2010-07-28T07:34:54Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Wed, Jul 28, 2010 at 01:24, Bradley Wagner\n wrote:\n> I would love to be able to use the -m flag and --log together with git\n> merge and pull to be able to create a custom commit message but also\n> include one-line summaries of each of the commits being merged/pulled.\n\nThis sort of thing has vaguely come up before, and it was mentioned\nthat you can just use a small script that calls git-filter-branch or\ngit-rebase -i.\n\nIt's easy to rewrite the commits you just pulled, having some feature\nthat e.g. adds a custom message to the beginning of each of them would\njust impose an artificial limitation and overlap with existing (and\nmore powerful) functionality.\n"},{"id":"146655","messageId":"AANLkTikA2jWu76aPUNG+B7Nwc9eDzoU93VcGvUFWR0Ri@mail.gmail.com","threadId":"24545","inReplyTo":"AANLkTinRvq71GS5WVdWs9zP5QSJ=TjCWBgTfRGn2Qub0@mail.gmail.com","subject":"Re: Possible feature request for merge and pull","fromName":"Avery Pennarun","fromEmail":"apenwarr@gmail.com","sentAt":"2010-07-28T20:49:11Z","receivedAt":"2010-07-28T20:49:11Z","isPatch":false,"sender":{"key":"apenwarr@gmail.com","avatar":"https://avatars.githubusercontent.com/u/20592?v=4"},"body":"On Wed, Jul 28, 2010 at 3:34 AM, Ævar Arnfjörð Bjarmason\n wrote:\n> On Wed, Jul 28, 2010 at 01:24, Bradley Wagner\n> wrote:\n>> I would love to be able to use the -m flag and --log together with git\n>> merge and pull to be able to create a custom commit message but also\n>> include one-line summaries of each of the commits being merged/pulled.\n>\n> This sort of thing has vaguely come up before, and it was mentioned\n> that you can just use a small script that calls git-filter-branch or\n> git-rebase -i.\n>\n> It's easy to rewrite the commits you just pulled, having some feature\n> that e.g. adds a custom message to the beginning of each of them would\n> just impose an artificial limitation and overlap with existing (and\n> more powerful) functionality.\n\nIf I understand correctly, the request is not to rewrite the pulled\ncommits, but just to produce a nice message in the newly-created merge\ncommit.\n\nIt sounds like --log and -m are currently incompatible, in that -m\noverrides --log, and that's not the desired behaviour. Bradley: this\nis probably a relatively easy fix to make, in case you're looking to\nget into some git hacking. :)\n\nHave fun,\n\nAvery\n"},{"id":"146656","messageId":"AANLkTimXe1SYiVONTnN_4e1ieAKNHgKwJ7fBOYjL-CUE@mail.gmail.com","threadId":"24545","inReplyTo":"AANLkTikA2jWu76aPUNG+B7Nwc9eDzoU93VcGvUFWR0Ri@mail.gmail.com","subject":"Re: Possible feature request for merge and pull","fromName":"Bradley Wagner","fromEmail":"bradley.wagner@hannonhill.com","sentAt":"2010-07-28T20:55:03Z","receivedAt":"2010-07-28T20:55:03Z","isPatch":false,"sender":{"key":"bradley.wagner@hannonhill.com","avatar":"https://gravatar.com/avatar/8304e5020b13d5f8102220fae2f5dd607a2e114dbe62bbd92c1ab38fe0b69fdb?d=mp&s=160"},"body":"Avery,\n\nOn Wed, Jul 28, 2010 at 4:49 PM, Avery Pennarun wrote:\n> On Wed, Jul 28, 2010 at 3:34 AM, Ævar Arnfjörð Bjarmason\n> wrote:\n>> On Wed, Jul 28, 2010 at 01:24, Bradley Wagner\n>> wrote:\n>>> I would love to be able to use the -m flag and --log together with git\n>>> merge and pull to be able to create a custom commit message but also\n>>> include one-line summaries of each of the commits being merged/pulled.\n>>\n>> This sort of thing has vaguely come up before, and it was mentioned\n>> that you can just use a small script that calls git-filter-branch or\n>> git-rebase -i.\n>>\n>> It's easy to rewrite the commits you just pulled, having some feature\n>> that e.g. adds a custom message to the beginning of each of them would\n>> just impose an artificial limitation and overlap with existing (and\n>> more powerful) functionality.\n>\n> If I understand correctly, the request is not to rewrite the pulled\n> commits, but just to produce a nice message in the newly-created merge\n> commit.\n\nYes, that's correct.\n\n> It sounds like --log and -m are currently incompatible, in that -m\n> overrides --log, and that's not the desired behaviour.\n\nCorrect, I can't remember which overrides which but basically it's as\nif you just used one of them. Also, git pull doesn't appear to take a\n-m flag at all.\n\n> Bradley: this\n> is probably a relatively easy fix to make, in case you're looking to\n> get into some git hacking. :)\n\nNice, I may check that out.\n\n>\n> Have fun,\n>\n> Avery\n>\n\n\n\n-- \nHannon Hill - Put Us to the Test\nbradley.wagner@hannonhill.com | http://www.hannonhill.com\n"},{"id":"146673","messageId":"20100729010341.GA25732@coredump.intra.peff.net","threadId":"24545","inReplyTo":"AANLkTikA2jWu76aPUNG+B7Nwc9eDzoU93VcGvUFWR0Ri@mail.gmail.com","subject":"Re: Possible feature request for merge and pull","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2010-07-29T01:03:41Z","receivedAt":"2010-07-29T01:03:41Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Jul 28, 2010 at 04:49:11PM -0400, Avery Pennarun wrote:\n\n> It sounds like --log and -m are currently incompatible, in that -m\n> overrides --log, and that's not the desired behaviour. Bradley: this\n> is probably a relatively easy fix to make, in case you're looking to\n> get into some git hacking. :)\n\nReally? I get:\n\n $ mkdir repo && cd repo && git init &&\n echo content >file && git add file && git commit -m one &&\n echo content >>file && git commit -a -m two &&\n git checkout -b other HEAD^ &&\n echo content >file2 && git add file2 && git commit -m three &&\n git merge --log -m \"custom message\" master &&\n git show\n\n commit fa21035ea5f5437e8664a5d249e7ab88ee3f0e75\n Merge: d12be4a 4dc5cba\n Author: Jeff King \n Date: Wed Jul 28 20:50:39 2010 -0400\n\n custom message\n\n * master:\n two\n\nwhich seems to be what was asked for. So is the problem just that\ngit-pull does not take \"-m\"?\n\n-Peff\n"},{"id":"146676","messageId":"AANLkTikP+5GxyWbXNcKeOtQoOEGAT9v313jAum+q-1LV@mail.gmail.com","threadId":"24545","inReplyTo":"20100729010341.GA25732@coredump.intra.peff.net","subject":"Re: Possible feature request for merge and pull","fromName":"Bradley Wagner","fromEmail":"bradley.wagner@hannonhill.com","sentAt":"2010-07-29T01:21:21Z","receivedAt":"2010-07-29T01:21:21Z","isPatch":false,"sender":{"key":"bradley.wagner@hannonhill.com","avatar":"https://gravatar.com/avatar/8304e5020b13d5f8102220fae2f5dd607a2e114dbe62bbd92c1ab38fe0b69fdb?d=mp&s=160"},"body":"On Wed, Jul 28, 2010 at 9:03 PM, Jeff King wrote:\n> On Wed, Jul 28, 2010 at 04:49:11PM -0400, Avery Pennarun wrote:\n>\n>> It sounds like --log and -m are currently incompatible, in that -m\n>> overrides --log, and that's not the desired behaviour.  Bradley: this\n>> is probably a relatively easy fix to make, in case you're looking to\n>> get into some git hacking. :)\n>\n> Really? I get:\n>\n>  $ mkdir repo && cd repo && git init &&\n>    echo content >file && git add file && git commit -m one &&\n>    echo content >>file && git commit -a -m two &&\n>    git checkout -b other HEAD^ &&\n>    echo content >file2 && git add file2 && git commit -m three &&\n>    git merge --log -m \"custom message\" master &&\n>    git show\n>\n>  commit fa21035ea5f5437e8664a5d249e7ab88ee3f0e75\n>  Merge: d12be4a 4dc5cba\n>  Author: Jeff King \n>  Date:   Wed Jul 28 20:50:39 2010 -0400\n>\n>      custom message\n>\n>      * master:\n>        two\n>\n> which seems to be what was asked for. So is the problem just that\n> git-pull does not take \"-m\"?\n>\n> -Peff\n>\n\n--log is supposed to include one-log summaries of each of the merged\ncommits, right? It's not doing that for me when when I do 'git merge\n--log -m \"message\" '. Instead, it's only using the message I\nspecified with -m.\n\nOne difference is that I'm merging topic branch into master but that\nshouldn't make any difference.\n\nYour right that the other part of the request is to add -m to pull.\n"},{"id":"146677","messageId":"20100729012723.GH29156@dert.cs.uchicago.edu","threadId":"24545","inReplyTo":"AANLkTikP+5GxyWbXNcKeOtQoOEGAT9v313jAum+q-1LV@mail.gmail.com","subject":"Re: Possible feature request for merge and pull","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-07-29T01:27:23Z","receivedAt":"2010-07-29T01:27:23Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Bradley Wagner wrote:\n> On Wed, Jul 28, 2010 at 9:03 PM, Jeff King wrote:\n\n>> Really? I get:\n[...]\n> --log is supposed to include one-log summaries of each of the merged\n> commits, right? It's not doing that for me\n\nJust a wild guess, but are you using a version of git before\n1.7.1.1?\n\nIf you upgrade, you'll be able to use -m with --log for\n\"git merge\", at least (v1.7.1.1~23^2: merge: --log appends\nshortlog to message if specified, 2010-05-11).\n\nThanks, Tay!\nJonathan\n"},{"id":"146678","messageId":"AANLkTinPcH-urWJJ_UELA5Kj=m3zKKLB8yGuvj6b03jw@mail.gmail.com","threadId":"24545","inReplyTo":"20100729012723.GH29156@dert.cs.uchicago.edu","subject":"Re: Possible feature request for merge and pull","fromName":"Bradley Wagner","fromEmail":"bradley.wagner@hannonhill.com","sentAt":"2010-07-29T01:30:07Z","receivedAt":"2010-07-29T01:30:07Z","isPatch":false,"sender":{"key":"bradley.wagner@hannonhill.com","avatar":"https://gravatar.com/avatar/8304e5020b13d5f8102220fae2f5dd607a2e114dbe62bbd92c1ab38fe0b69fdb?d=mp&s=160"},"body":"On Wed, Jul 28, 2010 at 9:27 PM, Jonathan Nieder wrote:\n> Bradley Wagner wrote:\n>> On Wed, Jul 28, 2010 at 9:03 PM, Jeff King wrote:\n>\n>>> Really? I get:\n> [...]\n>> --log is supposed to include one-log summaries of each of the merged\n>> commits, right? It's not doing that for me\n>\n> Just a wild guess, but are you using a version of git before\n> 1.7.1.1?\n\nCertainly am: git version 1.7.0\n\n> If you upgrade, you'll be able to use -m with --log for\n> \"git merge\", at least (v1.7.1.1~23^2: merge: --log appends\n> shortlog to message if specified, 2010-05-11).\n\nThanks, I'll do that.\n\n> Thanks, Tay!\n> Jonathan\n"},{"id":"146692","messageId":"AANLkTimt7Q++tAjNc7iZSUTdtaYphg9=Dtmaco3HUJSc@mail.gmail.com","threadId":"24545","inReplyTo":"AANLkTinPcH-urWJJ_UELA5Kj=m3zKKLB8yGuvj6b03jw@mail.gmail.com","subject":"Re: Possible feature request for merge and pull","fromName":"Bradley Wagner","fromEmail":"bradley.wagner@hannonhill.com","sentAt":"2010-07-29T04:20:32Z","receivedAt":"2010-07-29T04:20:32Z","isPatch":false,"sender":{"key":"bradley.wagner@hannonhill.com","avatar":"https://gravatar.com/avatar/8304e5020b13d5f8102220fae2f5dd607a2e114dbe62bbd92c1ab38fe0b69fdb?d=mp&s=160"},"body":"On Wed, Jul 28, 2010 at 9:30 PM, Bradley Wagner\n wrote:\n> On Wed, Jul 28, 2010 at 9:27 PM, Jonathan Nieder wrote:\n>> Bradley Wagner wrote:\n>>> On Wed, Jul 28, 2010 at 9:03 PM, Jeff King wrote:\n>>\n>>>> Really? I get:\n>> [...]\n>>> --log is supposed to include one-log summaries of each of the merged\n>>> commits, right? It's not doing that for me\n>>\n>> Just a wild guess, but are you using a version of git before\n>> 1.7.1.1?\n>\n> Certainly am: git version 1.7.0\n>\n>> If you upgrade, you'll be able to use -m with --log for\n>> \"git merge\", at least (v1.7.1.1~23^2: merge: --log appends\n>> shortlog to message if specified, 2010-05-11).\n>\n> Thanks, I'll do that.\n\nNew version works great with merge. Thanks guys! Now I'm wondering if\nwe could bring -m flag to pull.\n"},{"id":"146693","messageId":"AANLkTikYS97TKOcNoS42rczJJ6bUztQF1LbCa4qGk0xK@mail.gmail.com","threadId":"24545","inReplyTo":"AANLkTimt7Q++tAjNc7iZSUTdtaYphg9=Dtmaco3HUJSc@mail.gmail.com","subject":"Re: Possible feature request for merge and pull","fromName":"Avery Pennarun","fromEmail":"apenwarr@gmail.com","sentAt":"2010-07-29T04:22:21Z","receivedAt":"2010-07-29T04:22:21Z","isPatch":false,"sender":{"key":"apenwarr@gmail.com","avatar":"https://avatars.githubusercontent.com/u/20592?v=4"},"body":"On Thu, Jul 29, 2010 at 12:20 AM, Bradley Wagner\n wrote:\n> New version works great with merge. Thanks guys! Now I'm wondering if\n> we could bring -m flag to pull.\n\nI'm sure this is also an easy patch if you're in the mood to contribute it :)\n\nPerhaps there are reasons this was left out originally, but I'm\nguessing it was just that nobody expressed any need for it.\n\nHave fun,\n\nAvery\n"}]}