From: Junio C Hamano Date: Sun, 24 Sep 2017 10:39:43 +0000 (+0900) Subject: Merge branch 'jt/fast-export-copy-modify-fix' into next X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c02bfe19020638b155e6f8033f187c3c8a543b5f Merge branch 'jt/fast-export-copy-modify-fix' into next "git fast-export" with -M/-C option issued "copy" instruction on a path that is simultaneously modified, which was incorrect. * jt/fast-export-copy-modify-fix: fast-export: do not copy from modified file --- c02bfe19020638b155e6f8033f187c3c8a543b5f