diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 00:59:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 00:59:51 (GMT) |
| commit | 7d0c1f4556ad89b2f7eae97d31ea85c3bfdf7c87 (patch) | |
| tree | cce91296a436de34b3f81fe0ea4b433110ec69b5 /Documentation | |
| parent | 36eb1cb9cfe327583128a4b0abdf9516c2ca815b (diff) | |
| parent | e92aa0e4ef5a91781530449f9466a45c16c91f7f (diff) | |
| download | git-7d0c1f4556ad89b2f7eae97d31ea85c3bfdf7c87.zip git-7d0c1f4556ad89b2f7eae97d31ea85c3bfdf7c87.tar.gz git-7d0c1f4556ad89b2f7eae97d31ea85c3bfdf7c87.tar.bz2 | |
Merge branch 'tg/checkout-no-overlay'
"git checkout --no-overlay" can be used to trigger a new mode of
checking out paths out of the tree-ish, that allows paths that
match the pathspec that are in the current index and working tree
and are not in the tree-ish.
* tg/checkout-no-overlay:
revert "checkout: introduce checkout.overlayMode config"
checkout: introduce checkout.overlayMode config
checkout: introduce --{,no-}overlay option
checkout: factor out mark_cache_entry_for_checkout function
checkout: clarify comment
read-cache: add invalidate parameter to remove_marked_cache_entries
entry: support CE_WT_REMOVE flag in checkout_entry
entry: factor out unlink_entry function
move worktree tests to t24*
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-checkout.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 8c3d412..f179b43 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -260,6 +260,9 @@ the conflicted merge in the specified paths. This means that you can use `git checkout -p` to selectively discard edits from your current working tree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode. ++ +Note that this option uses the no overlay mode by default (see also +`--[no-]overlay`), and currently doesn't support overlay mode. --ignore-other-worktrees:: `git checkout` refuses when the wanted ref is already checked @@ -280,6 +283,13 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode. Do not attempt to create a branch if a remote tracking branch of the same name exists. +--[no-]overlay:: + In the default overlay mode, `git checkout` never + removes files from the index or the working tree. When + specifying `--no-overlay`, files that appear in the index and + working tree, but not in <tree-ish> are removed, to make them + match <tree-ish> exactly. + <branch>:: Branch to checkout; if it refers to a branch (i.e., a name that, when prepended with "refs/heads/", is a valid ref), then that |