diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-06-22 16:29:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-22 16:29:05 -0700 |
| commit | 4dd046932835d14c449f04ee0f3885669cad60c5 (patch) | |
| tree | 7b3e845ac4ce0e535ecbbb1685f964d1fdc22086 /Documentation/config | |
| parent | 6640c2d06d112675426cf436f0594f0e8c614848 (diff) | |
| parent | 926c40d04b5a77e00d3b22a5d2696c22b81569cc (diff) | |
| download | git-4dd046932835d14c449f04ee0f3885669cad60c5.tar.gz | |
Merge branch 'ja/worktree-orphan'
'git worktree add' learned how to create a worktree based on an
orphaned branch with `--orphan`.
* ja/worktree-orphan:
worktree add: emit warn when there is a bad HEAD
worktree add: extend DWIM to infer --orphan
worktree add: introduce "try --orphan" hint
worktree add: add --orphan flag
t2400: add tests to verify --quiet
t2400: refactor "worktree add" opt exclusion tests
t2400: cleanup created worktree in test
worktree add: include -B in usage docs
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/advice.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index c96b5b2e5d..c548a91e67 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -138,4 +138,8 @@ advice.*:: checkout. diverging:: Advice shown when a fast-forward is not possible. + worktreeAddOrphan:: + Advice shown when a user tries to create a worktree from an + invalid reference, to instruct how to create a new orphan + branch instead. -- |