git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Raimund Bauer <ray007@gmx.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Bill Lear <rael@zopyra.com>,
	git@vger.kernel.org
Subject: Re: pull into dirty working tree
Date: Thu, 14 Jun 2007 10:01:54 +0200	[thread overview]
Message-ID: <1181808114.6118.7.camel@localhost> (raw)
In-Reply-To: <7vps3zascu.fsf@assigned-by-dhcp.pobox.com>

On Thu, 2007-06-14 at 00:49 -0700, Junio C Hamano wrote:
> Linus Torvalds <torvalds@linux-foundation.org> writes:
> 
> > It might make it a bit easier for CVS people to get used to the git model: 
> > keep your dirty working tree, and do "git pull" to update it, and fix up 
> > any conflicts in the working tree. That's how CVS works - it's a bad 
> > model, but it's a model that may be worth supporting just to get people 
> > more easily into the _good_ model.
> 
> If a bad model _is_ supported, what incentive is there for these
> people to move into the good model, I honestly wonder...

Is it a bad model for the normal development process? Probably.

Would it solve the problem of "I want to keep my debug-statements that I
won't ever commit in the merged result"? ... yes

I think that's at least one valid usecase we should probably support.
One I'd also like to use ;-)

-- 
best regards

  Ray

  reply	other threads:[~2007-06-14  8:02 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 [this message]
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
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=1181808114.6118.7.camel@localhost \
    --to=ray007@gmx.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --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).