about summary refs log tree commit diff
path: root/third_party/git/Documentation/git-clean.txt
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/Documentation/git-clean.txt
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/Documentation/git-clean.txt')
-rw-r--r--third_party/git/Documentation/git-clean.txt16
1 files changed, 7 insertions, 9 deletions
diff --git a/third_party/git/Documentation/git-clean.txt b/third_party/git/Documentation/git-clean.txt
index a7f309dff5a3..0028ff12d1da 100644
--- a/third_party/git/Documentation/git-clean.txt
+++ b/third_party/git/Documentation/git-clean.txt
@@ -26,20 +26,18 @@ are affected.
 OPTIONS
 -------
 -d::
-	Normally, when no <path> is specified, git clean will not
-	recurse into untracked directories to avoid removing too much.
-	Specify -d to have it recurse into such directories as well.
-	If any paths are specified, -d is irrelevant; all untracked
-	files matching the specified paths (with exceptions for nested
-	git directories mentioned under `--force`) will be removed.
+	Remove untracked directories in addition to untracked files.
+	If an untracked directory is managed by a different Git
+	repository, it is not removed by default.  Use -f option twice
+	if you really want to remove such a directory.
 
 -f::
 --force::
 	If the Git configuration variable clean.requireForce is not set
 	to false, 'git clean' will refuse to delete files or directories
-	unless given -f or -i.  Git will refuse to modify untracked
-	nested git repositories (directories with a .git subdirectory)
-	unless a second -f is given.
+	unless given -f, -n or -i. Git will refuse to delete directories
+	with .git sub directory or file unless a second -f
+	is given.
 
 -i::
 --interactive::