Re: arch merge fallout.

[Dave Jones <davej@redhat.com>]

On Fri, Oct 12, 2007 at 03:43:46PM -0700, Linus Torvalds wrote:
 > 
 > 
 > On Fri, 12 Oct 2007, Dave Jones wrote:
 > > 
 > > pull req below.  If it turns out to be more trouble than its worth,
 > 
 > It merged totally automatically, no trouble what-so-ever:
 > 
 > 	Renamed arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c => arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
 > 	Auto-merged arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
 > 	Renamed arch/i386/kernel/cpu/cpufreq/longhaul.c => arch/x86/kernel/cpu/cpufreq/longhaul.c
 > 	Auto-merged arch/x86/kernel/cpu/cpufreq/longhaul.c
 > 	Auto-merged arch/powerpc/platforms/cell/cbe_cpufreq.c
 > 	Merge made by recursive.
 > 
 > I think it was just unlucky that the particular version of git you have 
 > probably hit exactly in the window of "limited rename detection" *and* 
 > lacking the config switch to turn off the limiter.

Awesome! Thanks for doing that.
One other git quirk that I'm not sure how to work around btw..
Something I find useful is to just do for eg..

git log arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c

from time to time, to figure out when certain changes happened,
or even to grep for something in a changelog.
With that file moved, git refuses to tell me about the log
of a file that doesn't exist, and the log of the moved
file in arch/x86 just has a single commit, detailing the move.

Is there an easy way to get the complete log of a file?

	Dave

-- 
http://www.codemonkey.org.uk