From: James Bottomley <James.Bottomley@SteelEye.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Petr Baudis <pasky@ucw.cz>, Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] make file merging respect permissions
Date: Sun, 24 Apr 2005 00:03:01 -0500 [thread overview]
Message-ID: <1114318981.4980.14.camel@mulgrave> (raw)
In-Reply-To: <Pine.LNX.4.58.0504232153500.15879@ppc970.osdl.org>
On Sat, 2005-04-23 at 21:55 -0700, Linus Torvalds wrote:
> Well, I actually ended up editing the line numbers manually and already
> pushed out the previous one, so you might want to double-check that my
> current tree matches yours.
Yes, the sha1 of my changed file and the one you merged match, so
everything looks sane.
Sorry for the confusion,
James
next prev parent reply other threads:[~2005-04-24 4:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-23 18:22 [PATCH] make file merging respect permissions James Bottomley
2005-04-23 20:17 ` Linus Torvalds
2005-04-23 20:37 ` James Bottomley
2005-04-23 21:44 ` James Bottomley
2005-04-23 23:02 ` Petr Baudis
2005-04-23 23:09 ` James Bottomley
2005-04-23 23:21 ` James Bottomley
2005-04-24 1:01 ` Linus Torvalds
2005-04-24 4:42 ` James Bottomley
2005-04-24 4:55 ` Linus Torvalds
2005-04-24 5:03 ` James Bottomley [this message]
2005-04-24 5:05 ` [PATH] fix segfault in fsck-cache Andreas Gal
2005-04-24 5:24 ` Andreas Gal
2005-04-24 12:46 ` [PATCH] make file merging respect permissions James Bottomley
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=1114318981.4980.14.camel@mulgrave \
--to=james.bottomley@steeleye.com \
--cc=git@vger.kernel.org \
--cc=pasky@ucw.cz \
--cc=torvalds@osdl.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).