diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:16 -0700 |
| commit | a5406125cc3989a7007d4fad7e5757cdb9837ebf (patch) | |
| tree | bbd443e667513d2f72ca573e29d8df74acfd905d /builtin/commit.c | |
| parent | Merge branch 'sb/submodule-config-doc-drop-path' into maint (diff) | |
| parent | worktree: allow the main brach of a bare repository to be checked out (diff) | |
| download | git-a5406125cc3989a7007d4fad7e5757cdb9837ebf.tar.gz git-a5406125cc3989a7007d4fad7e5757cdb9837ebf.zip | |
Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maint
In a worktree connected to a repository elsewhere, created via "git
worktree", "git checkout" attempts to protect users from confusion
by refusing to check out a branch that is already checked out in
another worktree. However, this also prevented checking out a
branch, which is designated as the primary branch of a bare
reopsitory, in a worktree that is connected to the bare
repository. The check has been corrected to allow it.
* dk/worktree-dup-checkout-with-bare-is-ok:
worktree: allow the main brach of a bare repository to be checked out
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions