Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

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

From: Ping Yin <hidden>
Date: 2016-06-15 22:44:06

On Jan 19, 2008 3:06 PM, Junio C Hamano [off-list ref] wrote:
"Ping Yin" [off-list ref] writes:
quoted
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.




-- 
Ping Yin
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help