diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-30 16:46:55 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-31 04:16:12 +0200 |
| commit | db9410990ee41f2b253763621c0023c782ec86e2 (patch) | |
| tree | 59a1b964e8437f0a06e9a4f2bbcb638849f18e2b /receive-pack.c | |
| parent | checkout: do not check out unmerged higher stages randomly (diff) | |
| download | git-db9410990ee41f2b253763621c0023c782ec86e2.tar.xz git-db9410990ee41f2b253763621c0023c782ec86e2.zip | |
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>
Diffstat (limited to 'receive-pack.c')
0 files changed, 0 insertions, 0 deletions