{"thread":{"id":"29725","subject":"FW: question about merge in 1.7.10","startedAt":"2012-02-24T14:33:14Z","lastAt":"2012-02-24T21:55:52Z","messageCount":7,"participants":["Marlene Cote","Zbigniew Jędrzejewski-Szmek","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"185336","messageId":"1F026B57884A5841B330471696849DE9114503D7@MBX021-W4-CA-5.exch021.domain.local","threadId":"29725","inReplyTo":null,"subject":"FW: question about merge in 1.7.10","fromName":"Marlene Cote","fromEmail":"marlene_cote@affirmednetworks.com","sentAt":"2012-02-24T14:33:14Z","receivedAt":"2012-02-24T14:33:14Z","isPatch":false,"sender":{"key":"marlene_cote@affirmednetworks.com","avatar":null},"body":"\nI used merge with -no-commit -no-ff.  So, I assume I won't see any change in behavior, since merge is not performing commits, right?\n\n------------------\nRegards,\nMarlene Cote, Release Engineering\n978-268-0821\n"},{"id":"185346","messageId":"4F47E51B.6080401@in.waw.pl","threadId":"29725","inReplyTo":"1F026B57884A5841B330471696849DE9114503D7@MBX021-W4-CA-5.exch021.domain.local","subject":"Re: FW: question about merge in 1.7.10","fromName":"Zbigniew Jędrzejewski-Szmek","fromEmail":"zbyszek@in.waw.pl","sentAt":"2012-02-24T19:29:31Z","receivedAt":"2012-02-24T19:29:31Z","isPatch":false,"sender":{"key":"zbyszek@in.waw.pl","avatar":"https://avatars.githubusercontent.com/u/349618?v=4"},"body":"On 02/24/2012 03:33 PM, Marlene Cote wrote:\n>\n> I used merge with -no-commit -no-ff.  So, I assume I won't see any change in behavior, since merge is not performing commits, right?\nHi Marlene,\n--no-commit only stops the last step, i.e. making of the commit. The \ntree (working files) is changed before that. So basically after a merge \nwith --no-commit, your tree will be dirty and git status will show \nmodified files.\n\nzbyszek\n"},{"id":"185348","messageId":"1F026B57884A5841B330471696849DE9114508EC@MBX021-W4-CA-5.exch021.domain.local","threadId":"29725","inReplyTo":"4F47E51B.6080401@in.waw.pl","subject":"RE: FW: question about merge in 1.7.10","fromName":"Marlene Cote","fromEmail":"marlene_cote@affirmednetworks.com","sentAt":"2012-02-24T19:33:58Z","receivedAt":"2012-02-24T19:33:58Z","isPatch":false,"sender":{"key":"marlene_cote@affirmednetworks.com","avatar":null},"body":"I know that the tree will be dirty.  The change to git in 1.7.10 says that the merge will require a commit message when the command is run.  Since I am not committing, I need to supply a message, but only later when I commit.  Not when I execute the merge command.  This means my scripts don't have to change.\n\n-----Original Message-----\nFrom: Zbigniew Jędrzejewski-Szmek [mailto:zbyszek@in.waw.pl] \nSent: Friday, February 24, 2012 2:30 PM\nTo: Marlene Cote\nCc: git@vger.kernel.org\nSubject: Re: FW: question about merge in 1.7.10\n\nOn 02/24/2012 03:33 PM, Marlene Cote wrote:\n>\n> I used merge with -no-commit -no-ff.  So, I assume I won't see any change in behavior, since merge is not performing commits, right?\nHi Marlene,\n--no-commit only stops the last step, i.e. making of the commit. The tree (working files) is changed before that. So basically after a merge with --no-commit, your tree will be dirty and git status will show modified files.\n\nzbyszek\n\n"},{"id":"185352","messageId":"7vobsoypb3.fsf@alter.siamese.dyndns.org","threadId":"29725","inReplyTo":"1F026B57884A5841B330471696849DE9114503D7@MBX021-W4-CA-5.exch021.domain.local","subject":"Re: FW: question about merge in 1.7.10","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-02-24T20:00:32Z","receivedAt":"2012-02-24T20:00:32Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Marlene Cote <Marlene_Cote@affirmednetworks.com> writes:\n\n> I used merge with -no-commit -no-ff. So, I assume I won't see any\n> change in behavior, since merge is not performing commits, right?\n\nThe _only_ difference is when\n\n (1) \"git merge\" is run interactively;\n (2) the merge goes cleanly that it does not need to ask help from the\n     user to resolve conflicts; and\n (3) it records the result by creating a commit.\n\nBecause your use case with \"--no-commit\" does not satisfy the last\ncriteria, I do not expect you to see any difference.  Otherwise you may\nhave found a bug.\n\nAs noted in\n\n    http://git-blame.blogspot.com/2012/02/anticipating-git-1710.html\n\nplease try out the version from the 'master' branch before it gets\nreleased, so that you can help us avoid surprises in the corner cases.\n\nThanks.\n"},{"id":"185382","messageId":"7vbooox6xy.fsf@alter.siamese.dyndns.org","threadId":"29725","inReplyTo":"1F026B57884A5841B330471696849DE9114508EC@MBX021-W4-CA-5.exch021.domain.local","subject":"Re: FW: question about merge in 1.7.10","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-02-24T21:22:33Z","receivedAt":"2012-02-24T21:22:33Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Marlene Cote <Marlene_Cote@affirmednetworks.com> writes:\n\n> I know that the tree will be dirty.  The change to git in 1.7.10 says\n> that the merge will require a commit message when the command is run.\n\nI do not think I ever said that.\n\n\t\"merge\" will always start an editor when it auto-commits\n\nis what I said.\n\nCould you point me where you read that \"will require a commit message\", so\nthat it can be corrected?\n"},{"id":"185383","messageId":"1F026B57884A5841B330471696849DE911450B9B@MBX021-W4-CA-5.exch021.domain.local","threadId":"29725","inReplyTo":"7vbooox6xy.fsf@alter.siamese.dyndns.org","subject":"RE: FW: question about merge in 1.7.10","fromName":"Marlene Cote","fromEmail":"marlene_cote@affirmednetworks.com","sentAt":"2012-02-24T21:24:50Z","receivedAt":"2012-02-24T21:24:50Z","isPatch":false,"sender":{"key":"marlene_cote@affirmednetworks.com","avatar":null},"body":"Sorry.  You are correct.  You said it would open an editor session.  \n\n-----Original Message-----\nFrom: Junio C Hamano [mailto:gitster@pobox.com] \nSent: Friday, February 24, 2012 4:23 PM\nTo: Marlene Cote\nCc: Zbigniew Jędrzejewski-Szmek; git@vger.kernel.org\nSubject: Re: FW: question about merge in 1.7.10\n\nMarlene Cote <Marlene_Cote@affirmednetworks.com> writes:\n\n> I know that the tree will be dirty.  The change to git in 1.7.10 says \n> that the merge will require a commit message when the command is run.\n\nI do not think I ever said that.\n\n\t\"merge\" will always start an editor when it auto-commits\n\nis what I said.\n\nCould you point me where you read that \"will require a commit message\", so that it can be corrected?\n"},{"id":"185388","messageId":"7v4nufopzr.fsf@alter.siamese.dyndns.org","threadId":"29725","inReplyTo":"1F026B57884A5841B330471696849DE911450B9B@MBX021-W4-CA-5.exch021.domain.local","subject":"Re: FW: question about merge in 1.7.10","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-02-24T21:55:52Z","receivedAt":"2012-02-24T21:55:52Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Marlene Cote <Marlene_Cote@affirmednetworks.com> writes:\n\n> Sorry.  You are correct.  You said it would open an editor session.  \n\nWhew.  I was really worried that we may be sending a wrong message and\nmaking users needlessly afraid of changes.\n\nThanks for a prompt response.\n"}]}