git merge changes file mode from 644 to 755

Hello, I've noticed strange behavior of git merge on Windows with core.filemode=false (set by default). Git changed mode of some files from 644 to 755 for unknown reason. One of the files is stdafx.cpp, it's absent in the common ancestor, it was added in the first branch (master) with mode 644 and

Re: Joining historical repository using grafts or replace

Hi Christian, > On Thu, Oct 30, 2014 at 6:41 PM, Dmitry Oksenchuk > wrote: >> 2014-10-30 19:54 GMT+03:00 Christian Couder : >>> >>> This might be a good idea. Did you already test that the small >>> repository is really faster than the full repository? &g

Re: [git] Joining historical repository using grafts or replace

2014-10-30 18:44 GMT+03:00 W. Trevor King : > On Thu, Oct 30, 2014 at 06:39:56PM +0300, Dmitry Oksenchuk wrote: >> We're in the middle of conversion of a large CVS repository (20 >> years, 70K commits, 1K branches, 10K tags) to Git and considering >> two separate Git

Re: Joining historical repository using grafts or replace

Hi Christian, Thanks for your reply. 2014-10-30 19:54 GMT+03:00 Christian Couder : > On Thu, Oct 30, 2014 at 4:39 PM, Dmitry Oksenchuk > wrote: >> We're in the middle of conversion of a large CVS repository (20 years, >> 70K commits, 1K branches, 10K tags) to

Joining historical repository using grafts or replace

Hello, We're in the middle of conversion of a large CVS repository (20 years, 70K commits, 1K branches, 10K tags) to Git and considering two separate Git repositories: "historical" with CVS history and "working" created without history from heads of active branches (10 active branches). This allow