Re: [PATCH 15/30] merge-recursive: Move the get_renames() function

2017-11-14 Thread Junio C Hamano
Elijah Newren writes: > Eek! My apologies. I will go through and fix them up. I see no > reference to checkpatch.pl in git, but a google search shows there's > one in the linux source tree. Is that were I get it from, or is there > a different one? > Also, would you like me to make a separ

Re: [PATCH 15/30] merge-recursive: Move the get_renames() function

2017-11-14 Thread Elijah Newren
On Mon, Nov 13, 2017 at 8:46 PM, Junio C Hamano wrote: > It took me a while to figure out that you are basing this on top of > a slightly older tip of 'master'. When rebasing on, or merging to, > a newer codebase Sorry about that. Yes, I worked on the series over time and rebased a couple time

Re: [PATCH 15/30] merge-recursive: Move the get_renames() function

2017-11-13 Thread Junio C Hamano
Elijah Newren writes: > I want to re-use some other functions in the file without moving those other > functions or dealing with a handful of annoying split function declarations > and definitions. > > Signed-off-by: Elijah Newren > --- It took me a while to figure out that you are basing this

[PATCH 15/30] merge-recursive: Move the get_renames() function

2017-11-10 Thread Elijah Newren
I want to re-use some other functions in the file without moving those other functions or dealing with a handful of annoying split function declarations and definitions. Signed-off-by: Elijah Newren --- merge-recursive.c | 138 +++--- 1 file change