git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jan Wielemaker <wielemak@science.uva.nl>
To: Jing Xue <jingxue@digizenstudio.com>
Cc: Petr Baudis <pasky@suse.cz>, git@vger.kernel.org
Subject: Re: Howto request: going home in the middle of something?
Date: Tue, 23 Oct 2007 20:38:20 +0200	[thread overview]
Message-ID: <200710232038.21206.wielemak@science.uva.nl> (raw)
In-Reply-To: <20071023135655.x6g6mln1j4880wog@intranet.digizenstudio.com>

On Tuesday 23 October 2007 19:56:55 Jing Xue wrote:
> Quoting Jan Wielemaker <wielemak@science.uva.nl>:
> > 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

  reply	other threads:[~2007-10-23 18:38 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
2007-10-23 17:56     ` Jing Xue
2007-10-23 18:38       ` Jan Wielemaker [this message]
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=200710232038.21206.wielemak@science.uva.nl \
    --to=wielemak@science.uva.nl \
    --cc=git@vger.kernel.org \
    --cc=jingxue@digizenstudio.com \
    --cc=pasky@suse.cz \
    /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).