projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 52229a2) | patch
checkout: error out when index is unmerged even with -m
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 Feb 2008 23:45:19 +0000 (15:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Feb 2008 08:36:31 +0000 (00:36 -0800)
commit04c9e11f2cffaf84dd20602f811bf377f6033cb6
treed208cc09f78b3467718c499fca7b50c03b0c9f87tree | snapshot
parent52229a29c78df2e48de23ed70ab1934667971d3ccommit | diff
checkout: error out when index is unmerged even with -m

Even when -m is given to allow fallilng back to 3-way merge
while switching branches, we should refuse if the original index
is unmerged.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Daniel Barkalow <barkalow@iabervon.org>
builtin-checkout.c diff | blob | history
Git—the stupid content tracker