On Fri, May 3, 2013 at 4:38 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Junio C Hamano <gitster@xxxxxxxxx> writes:
>
>> Duy Nguyen <pclouds@xxxxxxxxx> writes:
>>
>>> My setup is a bit peculiar where I do git development on three
>>> different machines. Say I updated branch long-branch-name on machine
>>> A. Then I continue my work on machine B. I would want to hard reset
>>> that long-branch-name on machine B before resuming my work. What I
>>> usually do is
>>>
>>> git co long-branch-name
>>> git diff A/long-branch-name
>>> git reset --hard A/long-branch-name
>>
>> Perhaps
>>
>> git checkout long-bra<TAB>
>> git diff A/!$
>> git reset --hard !$
"diff" does not have to follow "checkout".
>> In any case, not a Git question, I would have to say.
>
> As a Git question, probably the answers are
>
> git co long-bra<TAB>
> git diff @{u}
> git reset --hard @{u}
>
> with an appropriate setting of the upstream, perhaps?
and @{u} can't be used because I might want to resume from machine C
instead of A. I don't have a single upstream.
--
Duy
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html