From: Junio C Hamano <redacted>
Date: Mon, 23 Oct 2017 05:14:51 +0000 (+0900)
Subject: Merge branch 'jt/fast-export-copy-modify-fix' into maint
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=120ce97f9dd098b1c469f8d1812d4885e020a6e9;p=git.git

Merge branch 'jt/fast-export-copy-modify-fix' into maint

"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
---

120ce97f9dd098b1c469f8d1812d4885e020a6e9