Re: Move git-stash from one machine (or working copy) to another

Patrick Doyle [off-list ref] 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.

On Jan 21, 2011, at 9:49 AM, Junio C Hamano [off-list ref] wrote:

Patrick Doyle [off-list ref] writes:

quoted

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