]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a6ee883) | patch
merge-octopus: abort if index does not match HEAD
authorElijah Newren <newren@gmail.com>
Sun, 10 Apr 2016 06:13:38 +0000 (23:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2016 01:39:43 +0000 (18:39 -0700)
commit3ec62ad9ffba2476e30fdf8e8717756fe62119f9
tree8485a8c272cb56a6b4b90ddb41e3305864323ae4tree | snapshot
parenta6ee883b8eb56d200c3297184d29ea488a34cf43commit | diff
merge-octopus: abort if index does not match HEAD

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-merge-octopus.sh diff | blob | history
t/t6044-merge-unrelated-index-changes.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.