From: "Frans Klaver" <fransklaver@gmail.com>
To: git@vger.kernel.org
Subject: Re: More Beginning Git Questions
Date: Sat, 24 Sep 2011 22:53:52 +0200 [thread overview]
Message-ID: <op.v2byz2p80aolir@keputer.lokaal> (raw)
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
next prev parent reply other threads:[~2011-09-24 20:54 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-23 14:41 More Beginning Git Questions Jon Forrest
2011-09-23 16:11 ` Matthieu Moy
2011-09-23 17:42 ` Jakub Narebski
2011-09-23 18:14 ` Jon Forrest
2011-09-23 18:44 ` Mihamina Rakotomandimby
2011-09-23 18:59 ` Jakub Narebski
2011-09-24 20:22 ` tactical
2011-09-24 20:53 ` Frans Klaver [this message]
2011-09-24 22:17 ` tactical
2011-09-24 22:59 ` Seth Robertson
2011-09-25 2:16 ` tactical
2011-09-25 13:22 ` Jakub Narebski
2011-09-25 20:23 ` tactical
2011-09-25 20:58 ` Jakub Narebski
2011-09-25 21:07 ` tactical
2011-09-26 0:34 ` Konstantin Khomoutov
2011-09-26 0:56 ` tactical
2011-09-26 1:34 ` Andrew Ardill
2011-09-26 1:42 ` tactical
2011-09-26 18:03 ` Jakub Narebski
2011-09-24 21:10 ` Jakub Narebski
2011-09-24 22:10 ` tactical
2011-09-25 13:24 ` Jakub Narebski
2011-09-23 18:47 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=op.v2byz2p80aolir@keputer.lokaal \
--to=fransklaver@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).