aboutsummaryrefslogtreecommitdiff
path: root/base85.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-06 23:51:47 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-06 23:51:47 -0800
commit64da3ae5c188b2b09bc1ed1eedca7e84c1aff940 (patch)
tree6db42f5bc203bf29dff7e12c25cf6e481b7947ff /base85.c
parent6e8f993a5a17f71edfd26a026bbc83cbbd3c0638 (diff)
downloadgit-64da3ae5c188b2b09bc1ed1eedca7e84c1aff940.tar.gz
git-64da3ae5c188b2b09bc1ed1eedca7e84c1aff940.tar.xz
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>
Diffstat (limited to 'base85.c')
0 files changed, 0 insertions, 0 deletions