From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Patrick Doyle <wpdster@gmail.com>, git <git@vger.kernel.org>
Subject: Re: Move git-stash from one machine (or working copy) to another
Date: Sat, 22 Jan 2011 18:05:20 -0800 [thread overview]
Message-ID: <1E3784B5-76A2-4071-989D-46E271BB1BAC@gmail.com> (raw)
In-Reply-To: <7vfwsmp2op.fsf@alter.siamese.dyndns.org>
On Jan 21, 2011, at 9:49 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Patrick Doyle <wpdster@gmail.com> writes:
>
>> Is there an easy way to move work in progress from one machine to
>> another?
>>
>> One way to do it might be something like this:
>>
>> machine1$ git checkout -b movewip
>> machine1$ git add .
>> machine1$ git commit -m "Moving work in progress"
>> machine1$ git push origin movewip:movewip
>>
>> machine2$ git fetch origin movewip:movewip:
>> machine2$ git checkout movewip
>> machine2$ git reset HEAD^
>> machine2$ git stash
>> machine2$ git checkout master
>> machine2$ git stash pop
>>
>> # go through and delete movewip branches on machine1, machine2, and
>> the origin server
>>
>> Except for some possible typos, this seems like it would work, but
>> seems to be awfully clumsy. Is there a more elegant way to
>> accomplish
>> this?
>
> If your two machines can talk directly with each other (which seems
> to be
> the case from your "take that with me (somehow) to machine2"), you
> don't
> have to push and fetch through the origin.
This won't handle all cases, but it should do the trick 80%+ of the
time.
% git diff > foo.patch
(on other machine)
% git apply foo.patch
--
David
next prev parent reply other threads:[~2011-01-23 2:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-21 14:54 Move git-stash from one machine (or working copy) to another Patrick Doyle
2011-01-21 17:49 ` Junio C Hamano
2011-01-23 2:05 ` David Aguilar [this message]
2011-01-23 9:04 ` Matthieu Moy
2011-01-23 10:08 ` Andreas Schwab
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1E3784B5-76A2-4071-989D-46E271BB1BAC@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=wpdster@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).