2009/4/21 Patrick Doyle <wpdster@xxxxxxxxx>: > Hello, > I've developed a work habit of keeping my source code repository on a > USB stick and carrying that back and forth with me between work and > home. (I typically have small, branchless, single-developer > projects.) When I arrive at the other machine, I do > > $ git pull > (code, commit, code, commit, etc...) > $ git push > > Occasionally at the end of the day (if I'm at work) or at the end of > the night (if I'm at home), I'm in the middle of something that I want > to continue, and I end up making a "work-in-progress" commit > > $ git commit -a "WIP" > > just so I can pull that in the next day/evening and continue where I > left off. But that leaves a bunch of "WIP" commits in my history. I > started looking around for a better way to do this, and came across a > 2007 discussion (at > http://kerneltrap.org/index.php?q=mailarchive/git/2007/10/18/347020/thread) > where the OP really wanted (as do I) do be able to do something like > this: > > $ git stash > $ git push > $ git stash-push > (travel to other site) > $ git pull > $ git stash-pull > $ git stash apply > (continue coding and committing as before) > > There were a number of different suggestions, such as: > > $ git commit -b temp -a -m "Hold for transport home" > > Then when I get home I do this: > > $ git fetch work > $ git merge work/temp > $ git reset HEAD^ > # code code code > $ git commit -b temp -a -m "Hold for transport to work" > > When I'm finished at home and want to carry on at work: > > $ git fetch --force home > $ git merge home/temp > $ git reset HEAD^ > # start coding for the day > > ... or using git-bundle > > That discussion dates back to 2007. Is there a new, improved, 2009 > way of accomplishing this? > > --wpd man git-stash? or you can just git reset --soft HEAD^ away your wip commit. -- Mikael Magnusson -- 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