Messages in this thread | | | Date | Sat, 20 Oct 2007 02:40:18 -0700 | From | "Yinghai Lu" <> | Subject | Re: git/cscope with x86 merge |
| |
On 10/15/07, Linus Torvalds <torvalds@linux-foundation.org> wrote: > > > 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)
git log -p --follow arch/x86/kernel/vmlinux_64.lds.S
can not trace to arch/x86_64/kernel/vmlinux.lds.S
YH - 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/
| |