projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6e8f993) | patch
checkout -m: do not try to fall back to --merge from an unborn branch
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Jan 2010 07:51:47 +0000 (23:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Jan 2010 07:51:47 +0000 (23:51 -0800)
commit64da3ae5c188b2b09bc1ed1eedca7e84c1aff940
tree6db42f5bc203bf29dff7e12c25cf6e481b7947fftree | snapshot
parent6e8f993a5a17f71edfd26a026bbc83cbbd3c0638commit | diff
checkout -m: do not try to fall back to --merge from an unborn branch

If switching from an unborn branch (= empty tree) to a valid commit failed
without -m, it would fail with -m option as well.

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