]> git.ipfire.org Git - thirdparty/git.git/commit - git-merge-one-file.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a734291) | patch
Fix merge-one-file for our-side-added/our-side-removed cases
authorJunio C Hamano <gitster@pobox.com>
Sun, 8 Jul 2007 21:42:05 +0000 (14:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jul 2007 01:24:19 +0000 (18:24 -0700)
commit561b0fbb4a2d336faeb929380bddd6ec420d7b11
tree1d7055f97fc27809e3f90fef9c2d9193bb6cd4betree | snapshot
parenta7342913e21a96597f38ce0b48e3093c9739df1fcommit | diff
Fix merge-one-file for our-side-added/our-side-removed cases

When commit ed93b449 changed the script so that it does not
touch untracked working tree file, we forgot that we still
needed to resolve the index entry (otherwise they are left
unmerged).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-merge-one-file.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.