Date: Mon, 15 Oct 2007 13:00:38 -0700 (PDT)
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Yinghai Lu <yhlu.kernel@gmail.com>
cc: Andi Kleen <ak@suse.de>, Thomas Gleixner <tglx@linutronix.de>,
       Ingo Molnar <mingo@elte.hu>, Andrew Morton <akpm@linux-foundation.org>,
       Sam Ravnborg <sam@ravnborg.org>,
       Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: git/cscope with x86 merge
In-Reply-To: <86802c440710151245s7d12a45fpfdaa041546d965e@mail.gmail.com>
Message-ID: <alpine.LFD.0.999.0710151256260.6887@woody.linux-foundation.org>
References: <86802c440710151245s7d12a45fpfdaa041546d965e@mail.gmail.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=us-ascii
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1255
Lines: 42


On Mon, 15 Oct 2007, Yinghai Lu wrote:
>
> after the merge:
> 1. git
> git log -p arch/x86/kernel/io_apic_64.c
> only can show the log from the merge..., and can not get log before
> merge for x86_64/kernel/io_apic.c
> Any git update for that?

Use

	git log -p --follow arch/x86/kernel/io_apic_64.c

where the "--follow" tells git to follow renames.

And, of course, "git blame -C" will follow renames and copying of code 
across file boundaries too.

NOTE! In both cases you may actually have to tell git to not limit its 
rename detection when it sees lots of files. You can do that 
once-and-for-all with

	git config --global diff.renamelimit 0

which should take care of it (although it seems that due to unlucky 
timing, the current stable git release does not honor the renamelimit for 
merging, so if you actually need to have git merge data across a rename, 
you should use the current "master" branch of git. Junio is sadly away 
for two weeks right now)

> 2. cscope

No idea on cscope..

		Linus
-
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/