From: "David Symonds" <dsymonds@gmail.com>
To: "Ping Yin" <pkufranky@gmail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>
Subject: Re: Any command to simplify 'git fetch origin && git reset --hard origin/master'?
Date: Sat, 19 Jan 2008 17:04:43 +1100 [thread overview]
Message-ID: <ee77f5c20801182204r53ae03c2mac6d8fde9c4b260a@mail.gmail.com> (raw)
In-Reply-To: <46dff0320801182122t1581b366yad123407aaad6326@mail.gmail.com>
On Jan 19, 2008 4:22 PM, Ping Yin <pkufranky@gmail.com> wrote:
> I often encounter the case that the origin reposotory is rebased and i
> make sure i want to use the origin head as my master
> Now I have to do
> $ git fetch origin && git reset --hard origin/master
Use "git pull origin", which will do the fetch, and then merge it. If
you haven't made local changes, the merge will be a fast-forward and
so will get you an equivalent result.
Dave.
next prev parent reply other threads:[~2008-01-19 6:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-19 5:22 Any command to simplify 'git fetch origin && git reset --hard origin/master'? Ping Yin
2008-01-19 6:04 ` David Symonds [this message]
2008-01-19 7:06 ` Junio C Hamano
2008-01-19 8:03 ` Ping Yin
2008-01-19 8:06 ` Junio C Hamano
2008-01-19 8:08 ` Ping Yin
2008-01-19 11:15 ` Johannes Schindelin
2008-01-19 14:03 ` Ping Yin
2008-01-19 22:50 ` Johannes Schindelin
2008-01-20 8:51 ` Ping Yin
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=ee77f5c20801182204r53ae03c2mac6d8fde9c4b260a@mail.gmail.com \
--to=dsymonds@gmail.com \
--cc=git@vger.kernel.org \
--cc=pkufranky@gmail.com \
/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).