From: Linus Torvalds <torvalds@osdl.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] "checkout-cache -m" writes unmerged contents for each stage.
Date: Sun, 17 Apr 2005 19:56:28 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.58.0504171954410.7211@ppc970.osdl.org> (raw)
In-Reply-To: <7vfyxovm6j.fsf@assigned-by-dhcp.cox.net>
On Sun, 17 Apr 2005, Junio C Hamano wrote:
>
> One small detail. What about the "-x" bit?
You'll need to merge those kinds of changes separately for now. We'll have
to resolve that too, right now I think the -x bit gets lost on a merge
simply because we just write the temp-files, something merges them, and
does an "update-cache" on the merged result, and we'll pick up the -x bit
(or rather, lack of one) at that point.
Linus
prev parent reply other threads:[~2005-04-18 2:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-17 23:03 [PATCH] "checkout-cache -m" writes unmerged contents for each stage Junio C Hamano
2005-04-18 2:05 ` Linus Torvalds
2005-04-18 2:19 ` Junio C Hamano
2005-04-18 3:05 ` Linus Torvalds
2005-04-18 2:44 ` Junio C Hamano
2005-04-18 2:56 ` Linus Torvalds [this message]
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.58.0504171954410.7211@ppc970.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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