Hi,
On Mon, 22 Oct 2007, Jan Wielemaker wrote:
> 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)
You probably meant "git fetch jan@work:repo home:home".
> $ 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.
>
> Personally I'd be more happy with
>
> <work, in the middle of something>
> $ git stash
> <arriving at home>
> $ git stash fetch jan@work{0} (well, some sensible syntax)
> $ git stash apply
> <continue editing>
> $ git commit
> $ git push
> <arriving at work>
> $ git pull
Happily, that is already possible: However, instead of
git stash fetch jan@work{0}
you should say
git fetch jan@work stash:stash
This will only fetch the last stash, but that is what you wanted anyway,
right?
Ciao,
Dscho
P.S.: Since you top-posted, I just ignored the mail you quoted, assuming
that it was not relevant to your mail.
-
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
