diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-09-29 11:23:42 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-29 11:23:42 +0900 |
| commit | 8096e1d385660c159d9d47e69b2be63cf22e4f31 (patch) | |
| tree | 5d872b092c812f3365aa0e5c078edb6c3395abc3 /Documentation/git-am.txt | |
| parent | Merge branch 'mk/describe-match-with-all' (diff) | |
| parent | fast-export: do not copy from modified file (diff) | |
| download | tgif-8096e1d385660c159d9d47e69b2be63cf22e4f31.tar.xz | |
Merge branch 'jt/fast-export-copy-modify-fix'
"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 'Documentation/git-am.txt')
0 files changed, 0 insertions, 0 deletions