From: Olivier Galibert <galibert@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Bill Lear <rael@zopyra.com>, git@vger.kernel.org
Subject: Re: pull into dirty working tree
Date: Thu, 14 Jun 2007 22:20:27 +0200 [thread overview]
Message-ID: <20070614202027.GA47039@dspnet.fr.eu.org> (raw)
In-Reply-To: <alpine.LFD.0.98.0706140836450.14121@woody.linux-foundation.org>
On Thu, Jun 14, 2007 at 08:46:27AM -0700, Linus Torvalds wrote:
> So it might be easier to take a "git stash ; git pull ; git unstash"
> approach instead of making "git pull" handle working tree conflicts
> itseld.
Isn't that "git add .; git commit; git fetch; git rebase <something>;
git reset ^HEAD"? With the conflict resolution happening at rebase
time.
OG.
next prev parent reply other threads:[~2007-06-14 20:20 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-13 14:14 pull into dirty working tree Bill Lear
2007-06-13 14:38 ` Pierre Habouzit
2007-06-13 14:43 ` Pierre Habouzit
2007-06-13 14:47 ` Pierre Habouzit
2007-06-13 14:45 ` Bill Lear
2007-06-13 14:53 ` Pierre Habouzit
2007-06-13 15:01 ` Randal L. Schwartz
2007-06-13 19:28 ` Alex Riesen
2007-06-13 19:32 ` Randal L. Schwartz
2007-06-13 20:47 ` Alex Riesen
2007-06-13 20:52 ` Randal L. Schwartz
2007-06-13 21:39 ` Alex Riesen
2007-06-13 22:01 ` Randal L. Schwartz
2007-06-13 22:27 ` Alex Riesen
2007-06-13 15:01 ` Johannes Schindelin
2007-06-13 15:40 ` Andy Parkins
2007-06-13 15:54 ` Johannes Schindelin
2007-06-13 15:56 ` Bill Lear
2007-06-13 16:07 ` Johannes Schindelin
2007-06-13 16:30 ` Bill Lear
2007-06-13 17:13 ` Junio C Hamano
2007-06-14 4:22 ` Daniel Barkalow
2007-06-14 5:21 ` Linus Torvalds
2007-06-14 7:49 ` Junio C Hamano
2007-06-14 8:01 ` Raimund Bauer
2007-06-14 8:06 ` Steven Grimm
2007-06-14 14:25 ` Nicolas Pitre
2007-06-14 12:46 ` Bill Lear
2007-06-14 15:46 ` Linus Torvalds
2007-06-14 20:20 ` Olivier Galibert [this message]
2007-06-14 20:30 ` Linus Torvalds
2007-06-15 0:46 ` Martin Langhoff
2007-06-15 1:07 ` Linus Torvalds
2007-06-15 3:33 ` Martin Langhoff
2007-06-15 18:26 ` Robin Rosenberg
-- strict thread matches above, loose matches on Subject: below --
2007-06-13 15:03 MichaelTiloDressel
2007-06-13 15:36 ` Bill Lear
2007-06-13 17:31 ` Michael Dressel
2007-06-13 18:12 ` Bill Lear
2007-06-13 18:30 ` Johannes Schindelin
2007-06-13 18:56 ` Bill Lear
2007-06-13 20:17 ` Robin Rosenberg
2007-06-13 23:32 ` Johannes Schindelin
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=20070614202027.GA47039@dspnet.fr.eu.org \
--to=galibert@pobox.com \
--cc=git@vger.kernel.org \
--cc=rael@zopyra.com \
--cc=torvalds@linux-foundation.org \
/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).