aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/config
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-03-14 14:05:23 -0700
committerJunio C Hamano <gitster@pobox.com>2024-03-14 14:05:23 -0700
commit066124da88a6d43d125b30a1bc8a66c2d8ef6423 (patch)
tree77c885b7c2c7ca64fca79908afcdb6efc3ba9ff2 /Documentation/config
parent945115026aa63df4ab849ab14a04da31623abece (diff)
parent105ec9ae8d0d100994ddf1ee5e99e4616558ff90 (diff)
downloadgit-066124da88a6d43d125b30a1bc8a66c2d8ef6423.tar.gz
Merge branch 'so/clean-dry-run-without-force'
The implementation in "git clean" that makes "-n" and "-i" ignore clean.requireForce has been simplified, together with the documentation. * so/clean-dry-run-without-force: clean: further clean-up of implementation around "--force" clean: improve -n and -f implementation and documentation
Diffstat (limited to 'Documentation/config')
-rw-r--r--Documentation/config/clean.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config/clean.txt b/Documentation/config/clean.txt
index f05b9403b5..c0188ead4e 100644
--- a/Documentation/config/clean.txt
+++ b/Documentation/config/clean.txt
@@ -1,3 +1,3 @@
clean.requireForce::
- A boolean to make git-clean do nothing unless given -f,
- -i, or -n. Defaults to true.
+ A boolean to make git-clean refuse to delete files unless -f
+ is given. Defaults to true.