git.osdn.net Git - git-core/git.git/commit

author	Junio C Hamano <gitster@pobox.com>
	Fri, 29 Sep 2017 02:23:42 +0000 (11:23 +0900)
committer	Junio C Hamano <gitster@pobox.com>
	Fri, 29 Sep 2017 02:23:42 +0000 (11:23 +0900)
commit	8096e1d385660c159d9d47e69b2be63cf22e4f31
tree	5d872b092c812f3365aa0e5c078edb6c3395abc3	tree \| snapshot
parent	8c1bc7c244bf19e5c9fe5caa74389c022b8d24bc	commit \| diff
parent	b3e8ca89cfe34712a093c37fdbac7df7eaae91e7	commit \| diff

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

builtin/fast-export.c	diff1 \|	diff2 \|	blob \| history
t/t9350-fast-export.sh	diff1 \|	diff2 \|	blob \| history

Mirror of official git.git repository

RSS Atom

About OSDN

Find Software

Develop Software

Help

builtin/fast-export.c	diff1 \|	diff2 \|	blob \| history
t/t9350-fast-export.sh	diff1 \|	diff2 \|	blob \| history