projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5253ad1 b3e8ca8)
Merge branch 'jt/fast-export-copy-modify-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Oct 2017 05:14:51 +0000 (14:14 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Oct 2017 05:14:51 +0000 (14:14 +0900)
commit120ce97f9dd098b1c469f8d1812d4885e020a6e9
tree788c85f05d0357bc96a7950cdf73c8e4d87a8031tree | snapshot
parent5253ad109af7691d0b0fb3c9670aaaf775412c72commit | diff
parentb3e8ca89cfe34712a093c37fdbac7df7eaae91e7commit | diff
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
builtin/fast-export.c diff1 | diff2 | blob | history
t/t9350-fast-export.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.