Re: Linux 2.6.12-rc3

[Petr Baudis <pasky@ucw.cz>]

Dear diary, on Thu, Apr 21, 2005 at 02:03:27PM CEST, I got a letter
where Pavel Machek <pavel@ucw.cz> told me that...
> > You should put this into .git/remotes
> > 
> > linus	rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

(git addremote is preferred for that :-)

> > Then
> > 
> > RSYNC_FLAGS=-zavP git pull linus

-v is passed to rsync by default. I'll gladly add other reasonable rsync
flags (I don't call printing each considered file reasonable; fsck or
wget-like progressbar would be ideal).

> Well, not sure.
> 
> I did 
> 
> git track linus
> git cancel
> 
> but Makefile still contains -rc2. (Is "git cancel" right way to check
> out the tree?)

No. git cancel does what it says - cancels your local changes to the
working tree. git track will only set that next time you pull from
linus, the changes will be automatically merged. (Note that this will
change with the big UI change.)

Either do

	git track linus
	git pull

or

	git merge linus

to get Linus' changes if you didn't pull yet.

> and git diff -r linus: still contains some changes. [I did some
> experimental pull of scsi changes long time ago, is it that problem?]

If you don't have your HEAD on Linus' branch, it will do a tree merge
instead of fast-forward; that is, it will not just move your HEAD on
to match Linus' HEAD, but it will make a regular merge and then ask you
to do a merge commit.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/