diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-27 14:52:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-27 14:52:24 -0800 |
| commit | f09e74175dfa5b46587dab3c5dcbad16e9586de3 (patch) | |
| tree | 98626534b7796b0deb7948757fc5ec78b58166b2 /diff-lib.c | |
| parent | The third batch (diff) | |
| parent | checkout: forbid "-B <branch>" from touching a branch used elsewhere (diff) | |
| download | git-f09e74175dfa5b46587dab3c5dcbad16e9586de3.tar.gz git-f09e74175dfa5b46587dab3c5dcbad16e9586de3.zip | |
Merge branch 'jc/checkout-B-branch-in-use'
"git checkout -B <branch> [<start-point>]" allowed a branch that is
in use in another worktree to be updated and checked out, which
might be a bit unexpected. The rule has been tightened, which is a
breaking change. "--ignore-other-worktrees" option is required to
unbreak you, if you are used to the current behaviour that "-B"
overrides the safety.
* jc/checkout-B-branch-in-use:
checkout: forbid "-B <branch>" from touching a branch used elsewhere
checkout: refactor die_if_checked_out() caller
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions