{"thread":{"id":"14073","subject":"\"git-pull --no-commit\" should imply --no-ff...?","startedAt":"2008-06-21T14:08:51Z","lastAt":"2008-06-22T14:01:59Z","messageCount":4,"participants":["Stefan Richter","Graham Wilson","Miklos Vajna"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"80549","messageId":"tkrat.5aa5af8e9968819c@s5r6.in-berlin.de","threadId":"14073","inReplyTo":null,"subject":"\"git-pull --no-commit\" should imply --no-ff...?","fromName":"Stefan Richter","fromEmail":"stefanr@s5r6.in-berlin.de","sentAt":"2008-06-21T14:08:51Z","receivedAt":"2008-06-21T14:08:51Z","isPatch":false,"sender":{"key":"stefanr@s5r6.in-berlin.de","avatar":null},"body":"Hi list,\n\ntrying \"git pull --no-commit . foo\" for the first time, I was confused\nthat --no-commit was a no-op when the pull resulted in a fast-forward.\nI.e. HEAD advanced the whole chain of commits to foo.  I expected it to\napply the diff of HEAD..foo but not commit them.\n\nI then learned that \"git pull --no-ff --no-commit . foo\" does what I\nwanted.  What good does it do to ignore --no-commit in the fast-forward\ncase unless --no-ff is given?\n\nThis is with git 1.5.4.5.\n-- \nStefan Richter\n-=====-==--- -==- =-=-=\nhttp://arcgraph.de/sr/\n"},{"id":"80609","messageId":"20080622133606.GA21828@endor.mknod.org","threadId":"14073","inReplyTo":"tkrat.5aa5af8e9968819c@s5r6.in-berlin.de","subject":"Re: \"git-pull --no-commit\" should imply --no-ff...?","fromName":"Graham Wilson","fromEmail":"graham@mknod.org","sentAt":"2008-06-22T13:36:06Z","receivedAt":"2008-06-22T13:36:06Z","isPatch":false,"sender":{"key":"graham@mknod.org","avatar":null},"body":"On Sat, Jun 21, 2008 at 04:08:51PM +0200, Stefan Richter wrote:\n> trying \"git pull --no-commit . foo\" for the first time, I was confused\n> that --no-commit was a no-op when the pull resulted in a fast-forward.\n> I.e. HEAD advanced the whole chain of commits to foo.  I expected it to\n> apply the diff of HEAD..foo but not commit them.\n\n--no-commit to me seems to mean don't commit a merge commit. Maybe what\nyou want is something like:\n\n git-diff HEAD foo | git-apply\n\n-- \ngram\n"},{"id":"80611","messageId":"20080622134946.GL29404@genesis.frugalware.org","threadId":"14073","inReplyTo":"20080622133606.GA21828@endor.mknod.org","subject":"Re: \"git-pull --no-commit\" should imply --no-ff...?","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-06-22T13:49:46Z","receivedAt":"2008-06-22T13:49:46Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Sun, Jun 22, 2008 at 08:36:06AM -0500, Graham Wilson <graham@mknod.org> wrote:\n> On Sat, Jun 21, 2008 at 04:08:51PM +0200, Stefan Richter wrote:\n> > trying \"git pull --no-commit . foo\" for the first time, I was confused\n> > that --no-commit was a no-op when the pull resulted in a fast-forward.\n> > I.e. HEAD advanced the whole chain of commits to foo.  I expected it to\n> > apply the diff of HEAD..foo but not commit them.\n> \n> --no-commit to me seems to mean don't commit a merge commit. Maybe what\n> you want is something like:\n> \n>  git-diff HEAD foo | git-apply\n\nOr git merge --no-commit --squash?\n"},{"id":"80613","messageId":"485E5B57.5000307@s5r6.in-berlin.de","threadId":"14073","inReplyTo":"20080622133606.GA21828@endor.mknod.org","subject":"Re: \"git-pull --no-commit\" should imply --no-ff...?","fromName":"Stefan Richter","fromEmail":"stefanr@s5r6.in-berlin.de","sentAt":"2008-06-22T14:01:59Z","receivedAt":"2008-06-22T14:01:59Z","isPatch":false,"sender":{"key":"stefanr@s5r6.in-berlin.de","avatar":null},"body":"Graham Wilson wrote:\n> On Sat, Jun 21, 2008 at 04:08:51PM +0200, Stefan Richter wrote:\n>> trying \"git pull --no-commit . foo\" for the first time, I was confused\n>> that --no-commit was a no-op when the pull resulted in a fast-forward.\n>> I.e. HEAD advanced the whole chain of commits to foo.  I expected it to\n>> apply the diff of HEAD..foo but not commit them.\n> \n> --no-commit to me seems to mean don't commit a merge commit. Maybe what\n> you want is something like:\n> \n>  git-diff HEAD foo | git-apply\n> \n\nYes, I obviously got the wrong idea about git-pull --no-commit.\ngit-diff + git-apply indeed accomplishes what I wanted to do.  Thanks,\n-- \nStefan Richter\n-=====-==--- -==- =-==-\nhttp://arcgraph.de/sr/\n"}]}