From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Jan Wielemaker <wielemak@science.uva.nl>
Cc: Petr Baudis <pasky@suse.cz>, git@vger.kernel.org
Subject: Re: Howto request: going home in the middle of something?
Date: Mon, 22 Oct 2007 12:32:43 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0710221230130.25221@racer.site> (raw)
In-Reply-To: <200710221044.24191.wielemak@science.uva.nl>
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.
next prev parent reply other threads:[~2007-10-22 11:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-18 9:44 Howto request: going home in the middle of something? Jan Wielemaker
2007-10-18 10:37 ` Johannes Sixt
2007-10-18 11:07 ` Karl Hasselström
2007-10-18 11:27 ` Petr Baudis
2007-10-22 8:44 ` Jan Wielemaker
2007-10-22 11:32 ` Johannes Schindelin [this message]
2007-10-23 17:56 ` Jing Xue
2007-10-23 18:38 ` Jan Wielemaker
2007-10-23 20:28 ` Matthias Kestenholz
2007-10-24 13:44 ` Jing Xue
2007-10-18 11:29 ` Andy Parkins
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0710221230130.25221@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=pasky@suse.cz \
--cc=wielemak@science.uva.nl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).