diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-06 23:51:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-06 23:51:47 -0800 |
| commit | 64da3ae5c188b2b09bc1ed1eedca7e84c1aff940 (patch) | |
| tree | 6db42f5bc203bf29dff7e12c25cf6e481b7947ff /git-merge-octopus.sh | |
| parent | branch: die explicitly why when calling "git branch [-a|-r] branchname". (diff) | |
| download | tgif-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 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions