summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Thomas Gummerer <t.gummerer@gmail.com>2019-02-04 21:13:16 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-02-04 13:30:14 -0800
commite92aa0e4ef5a91781530449f9466a45c16c91f7f (patch)
treef72dbe0c834e26a998196a749795ea7b70df53d9 /Documentation
parentcheckout: introduce checkout.overlayMode config (diff)
downloadtgif-e92aa0e4ef5a91781530449f9466a45c16c91f7f.tar.xz
revert "checkout: introduce checkout.overlayMode config"
This reverts 1495ff7da5 ("checkout: introduce checkout.overlayMode config", 2019-01-08) and thus removes the checkout.overlayMode config option. The option was originally introduced to give users the option to make the new no-overlay behaviour the default. However users may be using 'git checkout' in scripts, even though it is porcelain. Users setting the option to false may actually end up accidentally breaking scripts. With the introduction of a new subcommand that will make the behaviour the default, the config option will not be needed anymore anyway. Revert the commit and remove the config option, so we don't risk breaking scripts. Suggested-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config/checkout.txt7
1 files changed, 0 insertions, 7 deletions
diff --git a/Documentation/config/checkout.txt b/Documentation/config/checkout.txt
index 73380a8d86..c4118fa196 100644
--- a/Documentation/config/checkout.txt
+++ b/Documentation/config/checkout.txt
@@ -21,10 +21,3 @@ checkout.optimizeNewBranch::
will not update the skip-worktree bit in the index nor add/remove
files in the working directory to reflect the current sparse checkout
settings nor will it show the local changes.
-
-checkout.overlayMode::
- In the default overlay mode, `git checkout` never
- removes files from the index or the working tree. When
- setting `checkout.overlayMode` to false, files that appear in
- the index and working tree, but not in <tree-ish> are removed,
- to make them match <tree-ish> exactly.