no --dry-run to git-pull ?

no --dry-run to git-pull ?

[Neshama Parhoti]

Hi,

Isn't there a way to do a --dry-run with git-pull ?

Thank you,
pnesh

Re: no --dry-run to git-pull ?

[Miklos Vajna]

[-- Attachment #1: Type: text/plain, Size: 500 bytes --]

On Fri, Jul 04, 2008 at 04:56:27PM +0300, Neshama Parhoti <pneshama@gmail.com> wrote:
> Isn't there a way to do a --dry-run with git-pull ?

Not really. But you can do a 'git fetch origin', then a
'git log master..origin/master', and it'll tell you what changes will be
merged if you do a 'git merge origin/master'.

NOTES:

1) Replace origin and master with your repomte and branch.

2) If this sounds cryptic for you, then it might be an important info
that by default a pull is a fetch + a merge.

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: no --dry-run to git-pull ?

[Neshama Parhoti]

On Fri, Jul 4, 2008 at 4:59 PM, Miklos Vajna <vmiklos@frugalware.org> wrote:
> On Fri, Jul 04, 2008 at 04:56:27PM +0300, Neshama Parhoti <pneshama@gmail.com> wrote:
>> Isn't there a way to do a --dry-run with git-pull ?
>
> Not really. But you can do a 'git fetch origin', then a
> 'git log master..origin/master', and it'll tell you what changes will be
> merged if you do a 'git merge origin/master'.
>
> NOTES:
>
> 1) Replace origin and master with your repomte and branch.
>
> 2) If this sounds cryptic for you, then it might be an important info
> that by default a pull is a fetch + a merge.

What puzzles me is the origin keyword. Is it set only if I initially
cloned a repo ?
Because in my case, I have just rsync'ed a repo to another station, so
I fear it will have no meaning in my case.
Thank you
>

Re: no --dry-run to git-pull ?

[Miklos Vajna]

[-- Attachment #1: Type: text/plain, Size: 636 bytes --]

On Fri, Jul 04, 2008 at 06:26:02PM +0300, Neshama Parhoti <pneshama@gmail.com> wrote:
> > 1) Replace origin and master with your remote and branch.
> >
> > 2) If this sounds cryptic for you, then it might be an important info
> > that by default a pull is a fetch + a merge.
> 
> What puzzles me is the origin keyword. Is it set only if I initially
> cloned a repo ?
> Because in my case, I have just rsync'ed a repo to another station, so
> I fear it will have no meaning in my case.

Heh. git remote add -f origin <url>, then you'll have it. And yes, you
have it if you cloned the repo, of course rsync won't add it. ;-)

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]