diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-23 14:14:51 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-23 14:14:51 +0900 |
| commit | 120ce97f9dd098b1c469f8d1812d4885e020a6e9 (patch) | |
| tree | 788c85f05d0357bc96a7950cdf73c8e4d87a8031 /builtin/commit.c | |
| parent | Merge branch 'nd/worktree-kill-parse-ref' into maint (diff) | |
| parent | fast-export: do not copy from modified file (diff) | |
| download | git-120ce97f9dd098b1c469f8d1812d4885e020a6e9.tar.gz git-120ce97f9dd098b1c469f8d1812d4885e020a6e9.zip | |
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
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions