From: Junio C Hamano <gitster@pobox.com>
To: Duy Nguyen <pclouds@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: Re: Another use of "@"?
Date: Thu, 02 May 2013 23:38:26 -0700 [thread overview]
Message-ID: <7vfvy4zhy5.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7vr4hozie1.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Thu, 02 May 2013 23:28:54 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Duy Nguyen <pclouds@gmail.com> 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 !$
>
> 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?
next prev parent reply other threads:[~2013-05-03 6:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-03 2:51 Another use of "@"? Duy Nguyen
2013-05-03 6:28 ` Junio C Hamano
2013-05-03 6:38 ` Junio C Hamano [this message]
2013-05-03 6:51 ` Duy Nguyen
2013-05-03 9:23 ` Thomas Rast
2013-05-03 22:09 ` Matthieu Moy
2013-05-04 3:26 ` Duy Nguyen
2013-05-04 3:48 ` Duy Nguyen
2013-05-03 6:39 ` Felipe Contreras
2013-05-04 12:44 ` Ramkumar Ramachandra
2013-05-04 21:11 ` Matthieu Moy
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=7vfvy4zhy5.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=artagnon@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=pclouds@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.