From: Linus Torvalds <torvalds@linux-foundation.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: John Dlugosz <JDlugosz@TradeStation.com>, git@vger.kernel.org
Subject: Re: Files different for me
Date: Wed, 25 Feb 2009 12:14:36 -0800 (PST) [thread overview]
Message-ID: <alpine.LFD.2.00.0902251213350.3111@localhost.localdomain> (raw)
In-Reply-To: <7vk57e1du3.fsf@gitster.siamese.dyndns.org>
On Wed, 25 Feb 2009, Junio C Hamano wrote:
>
> "git merge" has always had this "stash away local changes before starting,
> and unstash once done" safety when we try to run multiple strategies.
> A patch to trigger it even for a single strategy case may be trivial.
Well, I'd feel better if it was actually in the low-level merge code, the
way the current "I refuse to merge if the file is dirty" logic is.
Linus
next prev parent reply other threads:[~2009-02-25 20:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-25 16:11 Files different for me John Dlugosz
[not found] ` <16946e800902250840o677f8708x7c0bf8980e004b91@mail.gmail.com>
2009-02-25 16:42 ` Feanil Patel
2009-02-25 17:05 ` Brian Gernhardt
2009-02-25 18:02 ` John Dlugosz
2009-02-25 18:38 ` Brian Gernhardt
2009-02-25 19:01 ` John Dlugosz
2009-02-25 18:44 ` Matthieu Moy
2009-02-25 17:55 ` Junio C Hamano
2009-02-25 18:04 ` Linus Torvalds
2009-02-25 18:51 ` Junio C Hamano
2009-02-25 19:12 ` Linus Torvalds
2009-02-25 20:06 ` Junio C Hamano
2009-02-25 20:14 ` Linus Torvalds [this message]
2009-02-25 19:16 ` Jay Soffian
2009-02-25 19:38 ` John Dlugosz
2009-02-25 19:23 ` John Dlugosz
2009-02-25 20:04 ` Junio C Hamano
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=alpine.LFD.2.00.0902251213350.3111@localhost.localdomain \
--to=torvalds@linux-foundation.org \
--cc=JDlugosz@TradeStation.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).