{"thread":{"id":"14288","subject":"no --dry-run to git-pull ?","startedAt":"2008-07-04T13:56:27Z","lastAt":"2008-07-04T15:29:15Z","messageCount":4,"participants":["Neshama Parhoti","Miklos Vajna"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"82232","messageId":"912ec82a0807040656y1c48cba8m6f9981f6bb97b36a@mail.gmail.com","threadId":"14288","inReplyTo":null,"subject":"no --dry-run to git-pull ?","fromName":"Neshama Parhoti","fromEmail":"pneshama@gmail.com","sentAt":"2008-07-04T13:56:27Z","receivedAt":"2008-07-04T13:56:27Z","isPatch":false,"sender":{"key":"pneshama@gmail.com","avatar":null},"body":"Hi,\n\nIsn't there a way to do a --dry-run with git-pull ?\n\nThank you,\npnesh\n"},{"id":"82233","messageId":"20080704135944.GA4729@genesis.frugalware.org","threadId":"14288","inReplyTo":"912ec82a0807040656y1c48cba8m6f9981f6bb97b36a@mail.gmail.com","subject":"Re: no --dry-run to git-pull ?","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-07-04T13:59:44Z","receivedAt":"2008-07-04T13:59:44Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Fri, Jul 04, 2008 at 04:56:27PM +0300, Neshama Parhoti <pneshama@gmail.com> wrote:\n> Isn't there a way to do a --dry-run with git-pull ?\n\nNot really. But you can do a 'git fetch origin', then a\n'git log master..origin/master', and it'll tell you what changes will be\nmerged if you do a 'git merge origin/master'.\n\nNOTES:\n\n1) Replace origin and master with your repomte and branch.\n\n2) If this sounds cryptic for you, then it might be an important info\nthat by default a pull is a fetch + a merge.\n"},{"id":"82235","messageId":"912ec82a0807040826v64afcc55i646d9c73b6fa8cd0@mail.gmail.com","threadId":"14288","inReplyTo":"20080704135944.GA4729@genesis.frugalware.org","subject":"Re: no --dry-run to git-pull ?","fromName":"Neshama Parhoti","fromEmail":"pneshama@gmail.com","sentAt":"2008-07-04T15:26:02Z","receivedAt":"2008-07-04T15:26:02Z","isPatch":false,"sender":{"key":"pneshama@gmail.com","avatar":null},"body":"On Fri, Jul 4, 2008 at 4:59 PM, Miklos Vajna <vmiklos@frugalware.org> wrote:\n> On Fri, Jul 04, 2008 at 04:56:27PM +0300, Neshama Parhoti <pneshama@gmail.com> wrote:\n>> Isn't there a way to do a --dry-run with git-pull ?\n>\n> Not really. But you can do a 'git fetch origin', then a\n> 'git log master..origin/master', and it'll tell you what changes will be\n> merged if you do a 'git merge origin/master'.\n>\n> NOTES:\n>\n> 1) Replace origin and master with your repomte and branch.\n>\n> 2) If this sounds cryptic for you, then it might be an important info\n> that by default a pull is a fetch + a merge.\n\nWhat puzzles me is the origin keyword. Is it set only if I initially\ncloned a repo ?\nBecause in my case, I have just rsync'ed a repo to another station, so\nI fear it will have no meaning in my case.\nThank you\n>\n"},{"id":"82236","messageId":"20080704152915.GD4729@genesis.frugalware.org","threadId":"14288","inReplyTo":"912ec82a0807040826v64afcc55i646d9c73b6fa8cd0@mail.gmail.com","subject":"Re: no --dry-run to git-pull ?","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-07-04T15:29:15Z","receivedAt":"2008-07-04T15:29:15Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Fri, Jul 04, 2008 at 06:26:02PM +0300, Neshama Parhoti <pneshama@gmail.com> wrote:\n> > 1) Replace origin and master with your remote and branch.\n> >\n> > 2) If this sounds cryptic for you, then it might be an important info\n> > that by default a pull is a fetch + a merge.\n> \n> What puzzles me is the origin keyword. Is it set only if I initially\n> cloned a repo ?\n> Because in my case, I have just rsync'ed a repo to another station, so\n> I fear it will have no meaning in my case.\n\nHeh. git remote add -f origin <url>, then you'll have it. And yes, you\nhave it if you cloned the repo, of course rsync won't add it. ;-)\n"}]}