On Sat, 24 Sep 2011 22:22:31 +0200, tactical <a5158017@xxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html