Re: Merging five months of Linux kernel history

On Sun, 2006-10-29 12:34:53 -0800, Junio C Hamano [off-list ref] wrote:

Jan-Benedict Glaw [off-list ref] writes:

quoted

Due to a move to a new flat and other reasons, I wasn't able to
do daily merges from Linus's tree into our vax-linux tree.
My time situation has improved and I want to merge all the new
and shiny stuff, but it seems a straight "git pull" isn't the
best way to do that.

What I'd actually love to do is to go through all commits since the
last merge and pull/accept/cherry-pick then one by one.  That way I'll
learn about new stuff. I'll specifically see generic changes that
imply arch-specific stuff, things I'll need to implement later on.

Is there any sane way to cluse such a large gap?  I don't mind looking
through tenthousands of commits, as long as I get a chance to spot
"important" ones.

I think the best way is:

	git pull
        git log ORIG_HEAD..

The latter would give your ten thousands of commits to inspect.

If the pull results in a conflict, then

	git pull
	git log --merge

	... fix conflicts ...
	git commit
        git log ORIG_HEAD..

That's the point--I don't really expect any conflicts, or only a very
little number of them. Basically, only the Makefiles and the Kconfig
files do have a chance to conflict.  It's no more than a new arch/
directory and some drivers.

The hard part will be to figure out all the needed changes in arch
code, like the IRQ handling rework etc :)

MfG, JBG

-- 
      Jan-Benedict Glaw      jbglaw@lug-owl.de              +49-172-7608481
Signature of:           Ich hatte in letzter Zeit ein bißchen viel Realitycheck.
the second  :               Langsam möchte ich mal wieder weiterträumen können.