From: Glenn Morris <rgm@gnu.org>
To: help-gnu-emacs@gnu.org
Subject: Re: git:
Date: Fri, 27 Feb 2015 19:30:49 -0500 [thread overview]
Message-ID: <634mq6yj0m.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <r7385qx4r8.fsf@fencepost.gnu.org> (Glenn Morris's message of "Fri, 27 Feb 2015 19:24:11 -0500")
Glenn Morris wrote:
> It's a shame git is less user-friendly (refusing to pull if you have
> uncommitted changs, even if the changes are identical to what you want
> to pull) than eg bzr or svn, which just do the sensible thing (pull and
> resolve conflicts automatically where possible).
PS just to throw yet another thing out there, the generally advertised
solution for this problem seems to be: git stash; git pull; git stash
pop. Obviously this makes us look cool by playing with "stashes" and is
far superior to things Just Working like they used to. Yours grumpily...
prev parent reply other threads:[~2015-02-28 0:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-26 22:24 git: Gregor Zattler
2015-02-27 15:08 ` git: J. David Boyd
2015-02-28 0:03 ` git: Bob Proulx
2015-02-27 23:10 ` git: Michael Heerdegen
2015-02-27 23:57 ` git: Gregor Zattler
2015-02-28 0:24 ` git: Glenn Morris
2015-02-28 0:30 ` Glenn Morris [this message]
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=634mq6yj0m.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=help-gnu-emacs@gnu.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 read-only IMAP folder(s) and NNTP newsgroup(s).