| commit | 64da3ae5c188b2b09bc1ed1eedca7e84c1aff940 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Jan 2010 07:51:47 +0000 (6 23:51 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Jan 2010 07:51:47 +0000 (6 23:51 -0800) | ||
| tree | 6db42f5bc203bf29dff7e12c25cf6e481b7947ff | treesnapshot (tar.gz zip) |
| parent | 6e8f993a5a17f71edfd26a026bbc83cbbd3c0638 | commitdiff |
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>
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 | diffblobblamehistory |