From: Frans Klaver <fransklaver@gmail.com>
Date: Sat, 24 Sep 2011 20:53:52 GMT
Subject: Re: More Beginning Git Questions
Message-ID: <op.v2byz2p80aolir@keputer.lokaal>
In-Reply-To: <14gm3o851q0ad.1uoossmxgfyit.dlg@40tude.net>

On Sat, 24 Sep 2011 22:22:31 +0200, tactical <a5158017@nepwk.com> wrote:

> Mercurial allows this, and it's a very powerful feature.  After reading
> this thread, I could not believe Git didn't pulling with local changes,  
> and so I tried it, and also asked on IRC -- and it seems that Git really
> doesn't.

Git doesn't do it implicitly. Be explicit about it

$ git stash
$ git pull
$ git stash pop

seems to do exactly what you want.

Cheers,
Frans