On Tuesday 23 October 2007 19:56:55 Jing Xue wrote: > Quoting Jan Wielemaker <wielemak@xxxxxxxxxxxxxx>: > > Thanks for the replies. I think I can live with something like this > > > > <work, in the middle of something> > > $ git checkout -b home > > $ git commit > > $ git checkout master > > <arriving at home> > > $ git jan@work:repo fetch home:home (using ssh) > > $ git checkout home > > <continue editing> > > $ git commit --amend > > $ git checkout master > > $ git merge home > > $ git -d home > > $ git commit > > $ git push > > <arriving at work> > > $ git -d home > > $ git pull > > > > Its still a bit many commands and you have to be aware what you are > > doing for quite a while, but it does provide one single clean commit > > message, doesn't change the shared repo until all is finished and allows > > to abandon all work without leaving traces. > > What does the extra branch gain for us here? That's not a rhetorical > question, I'm actually curious to learn, because I always just commit, > switch to another computer, pull, and reset HEAD^. I'm just trying to learn. Sofar I like the idea to stash and use git-fetch to get the stash from the other side. As stash is about handling current work, it feels as the most appropriate solution and is a lot shorter. Cheers --- Jan - 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
