Re: Git merge checking

2014-01-17 Thread Alex Merry
On 16/01/14 23:53, Luigi Toscano wrote: > I can retrieve the full history using grafts. Only two details: > - flat.css, kde.css and print.css are part of the doxygen stuff, they should > be in the other repository; Good catch. > - mainfooter.html and mainheader.html have been removed from both >

Re: Git merge checking

2014-01-16 Thread Luigi Toscano
Alex Merry wrote: > I've done some git magic to copy the common/ directory (or, at least, > the relevant parts) from kapidox to kdoctools (where those files should > be located) in a history-preserving manner (for > https://git.reviewboard.kde.org/r/114969/). Thanks for the effort! > This can be

Git merge checking

2014-01-16 Thread Alex Merry
I've done some git magic to copy the common/ directory (or, at least, the relevant parts) from kapidox to kdoctools (where those files should be located) in a history-preserving manner (for https://git.reviewboard.kde.org/r/114969/). This can be found at kde:clones/kdoctools/alexmerry/kapidox-merg