author | Junio C Hamano <gitster@pobox.com> | |
Sat, 30 Aug 2008 14:46:55 +0000 (07:46 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 31 Aug 2008 02:16:12 +0000 (19:16 -0700) | ||
commit | db9410990ee41f2b253763621c0023c782ec86e2 | |
tree | 59a1b964e8437f0a06e9a4f2bbcb638849f18e2b | tree | snapshot |
parent | 8fdcf3125465f70c0cad5be5ab192d46e46307c7 | commit | diff |
checkout -f: allow ignoring unmerged paths when checking out of the index
Earlier we made "git checkout $pathspec" to atomically refuse
the operation of $pathspec matched any path with unmerged
stages. This patch allows:
$ git checkout -f a b c
to ignore, instead of error out on, such unmerged paths. The
fix to prevent checkout of an unmerged path from random stages
is still there.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Earlier we made "git checkout $pathspec" to atomically refuse
the operation of $pathspec matched any path with unmerged
stages. This patch allows:
$ git checkout -f a b c
to ignore, instead of error out on, such unmerged paths. The
fix to prevent checkout of an unmerged path from random stages
is still there.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-checkout.txt | diff | blob | history | |
builtin-checkout.c | diff | blob | history | |
t/t7201-co.sh | diff | blob | history |