git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Any command to simplify 'git fetch origin && git reset --hard origin/master'?

From
Ping Yin <pkufranky@gmail.com>
Date
Jan 19, 2008, 08:08 UTC
Message-ID
<46dff0320801190008p4489b7a2g6153ba7d30f942c3@mail.gmail.com>
In-Reply-To
<7vbq7i9r48.fsf@gitster.siamese.dyndns.org>
On Jan 19, 2008 4:06 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 32 quoted lines
>
> "Ping Yin" <pkufranky@gmail.com> writes:
>
> > On Jan 19, 2008 3:06 PM, Junio C Hamano <gitster@pobox.com> wrote:
> >> "Ping Yin" <pkufranky@gmail.com> writes:
> >>
> >> > 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
> >>
> >> The fact you are resetting means you do not have anything
> >> interesting in your own branch yourself (--hard will lose your
> >> changes and you are willing to lose it), which makes the use
> >> case much less interesting, but I can understand a workflow that
> >> is based around rebases, as in:
> >>
> >>         $ git fetch origin && git rebase origin/master
> >>
> > I know 'git pull --rebase' and use it frequently. However, in the case
> > i mentioned above, i never do any change in this local branch, i just
> > use this branch for deployment which should always keep the same with
> > the origin head (just like the remote tracking branch). So i need a
> > 'fetch & reset --hard' equivalent, not the 'fetch & rebase'
> > equivalent.
>
> Unless I am misreading you, you did not read what I wrote.
>
> If you do not have any change on that branch, "git rebase
> origin/master" will be equivalent to "git reset --hard
> origin/master".
>
But my case is that the origin head has been rewound.
-- 
Ping Yin
Previous: Junio C HamanoNext: Johannes Schindelin
Message 6 of 10 in “Any command to simplify 'git fetch origin && git reset --hard origin/master'?”
  1. Ping YinJan 19, 2008
  2. David SymondsJan 19, 2008
  3. Junio C HamanoJan 19, 2008
  4. Ping YinJan 19, 2008
  5. Junio C HamanoJan 19, 2008
  6. Ping YinJan 19, 2008
  7. Johannes SchindelinJan 19, 2008
  8. Ping YinJan 19, 2008
  9. Johannes SchindelinJan 19, 2008
  10. Ping YinJan 20, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.