From: Jing Xue <jingxue@digizenstudio.com>
To: git <git@vger.kernel.org>
Subject: Re: how do you "force a pull"?
Date: Sat, 25 Aug 2007 07:53:26 -0400 [thread overview]
Message-ID: <20070825115326.GB7122@falcon.digizenstudio.com> (raw)
In-Reply-To: <20070825113747.GA21030@mimvista.com>
On Sat, Aug 25, 2007 at 07:37:47AM -0400, David Watson wrote:
> $ git reset --hard origin/master
Ah, this is what I was looking for. Not very intuitive, but works like a
charm!
> You may be getting the "cannot merge message" if you have uncommitted
> changes, as git won't let you merge when the working copy is changed.
> git-pull is really git-fetch + git-merge.
Right, because I used "--soft" in the earlier reset.
Thanks!
--
Jing Xue
next prev parent reply other threads:[~2007-08-25 11:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-25 11:19 how do you "force a pull"? Jing Xue
2007-08-25 11:31 ` Dan Chokola
2007-08-25 11:37 ` David Watson
2007-08-25 11:53 ` Jing Xue [this message]
2007-08-25 13:19 ` Randal L. Schwartz
2007-08-26 19:02 ` Fredrik Tolf
2007-08-27 5:26 ` Jing Xue
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=20070825115326.GB7122@falcon.digizenstudio.com \
--to=jingxue@digizenstudio.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).