git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
David Aguilar <davvid@gmail.com>
Date
Jan 23, 2011, 02:05 UTC
Message-ID
<1E3784B5-76A2-4071-989D-46E271BB1BAC@gmail.com>
In-Reply-To
<7vfwsmp2op.fsf@alter.siamese.dyndns.org>
On Jan 21, 2011, at 9:49 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 32 quoted lines
> 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
Previous: Junio C HamanoNext: Matthieu Moy
Message 3 of 5 in “Move git-stash from one machine (or working copy) to another”
  1. Patrick DoyleJan 21, 2011
  2. Junio C HamanoJan 21, 2011
  3. David AguilarJan 23, 2011
  4. Matthieu MoyJan 23, 2011
  5. Andreas SchwabJan 23, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.