From: Linus Torvalds <torvalds@osdl.org>
To: James Bottomley <James.Bottomley@SteelEye.com>
Cc: git@vger.kernel.org, SCSI Mailing List <linux-scsi@vger.kernel.org>
Subject: Re: SCSI trees, merges and git status
Date: Mon, 18 Apr 2005 14:39:09 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.58.0504181429570.15725@ppc970.osdl.org> (raw)
In-Reply-To: <1113856118.4998.70.camel@mulgrave>
On Mon, 18 Apr 2005, James Bottomley wrote:
>
> As of today, I have two SCSI git trees operational:
>
> rsync://www.parisc-linux.org/~jejb/scsi-rc-fixes-2.6.git
Merged. Here's the command line history:
~/git/git-pull-script rsync://www.parisc-linux.org/~jejb/scsi-rc-fixes-2.6.git
merge-cache ~/git/git-merge-one-file-script -a
write-tree
commit-tree 2c8de70faf92af971667a26a6a397052fc572add -p $(cat .git/HEAD) -p $(cat .git/MERGE_HEAD)
ie the "git-pull-script" failed due to the content merge (I didn't trust
the merge-cache stuff enough to put that into it), but then doing the
automated merge was successful without any editing, so I just wrote the
tree and committed it.
Again, if anybody wants to reproduce this, you'll need to then do the
checkout-cache -f -a
update-cace --refresh
afterwards to make your working area match the merged tree.
> Linus, the rc-fixes repo is ready for applying ... it's the same one I
> announced on linux-scsi and lkml a while ago just with the git date
> information updated to be correct (the misc one should wait until after
> 2.6.12 is final).
Ok. Can you verify? I did a "git diff" between your old head and my new
head, and it did not show any SCSI files (only the expected arm etc stuff
that you didn't have in your), so it all _looks_ good. But hey, just to
make sure that I didn't do anything stupid..
Linus
next prev parent reply other threads:[~2005-04-18 21:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-18 20:28 SCSI trees, merges and git status James Bottomley
2005-04-18 21:39 ` Linus Torvalds [this message]
2005-04-18 23:14 ` James Bottomley
2005-04-19 0:03 ` Linus Torvalds
2005-04-19 0:10 ` David Woodhouse
2005-04-19 0:16 ` James Bottomley
2005-04-19 0:41 ` David Woodhouse
2005-04-19 0:13 ` James Bottomley
2005-04-19 0:29 ` Linus Torvalds
2005-04-19 2:17 ` James Bottomley
2005-04-19 3:04 ` Linus Torvalds
2005-04-18 23:23 ` Junio C Hamano
2005-04-18 23:28 ` Petr Baudis
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
List information: http://vger.kernel.org/majordomo-info.html
* 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.0504181429570.15725@ppc970.osdl.org \
--to=torvalds@osdl.org \
--cc=James.Bottomley@SteelEye.com \
--cc=git@vger.kernel.org \
--cc=linux-scsi@vger.kernel.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).