diff options
| -rw-r--r-- | Documentation/git-clean.txt | 4 | ||||
| -rw-r--r-- | builtin-clean.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt index 335c885bb..a81cb6c28 100644 --- a/Documentation/git-clean.txt +++ b/Documentation/git-clean.txt @@ -33,8 +33,8 @@ OPTIONS -f:: --force:: - If the git configuration specifies clean.requireForce as true, - 'git clean' will refuse to run unless given -f or -n. + If the git configuration variable clean.requireForce is not set + to false, 'git clean' will refuse to run unless given -f or -n. -n:: --dry-run:: diff --git a/builtin-clean.c b/builtin-clean.c index 3a70fa81b..fac64e6cd 100644 --- a/builtin-clean.c +++ b/builtin-clean.c @@ -67,8 +67,8 @@ int cmd_clean(int argc, const char **argv, const char *prefix) die("-x and -X cannot be used together"); if (!show_only && !force) - die("clean.requireForce%s set and -n or -f not given; " - "refusing to clean", config_set ? "" : " not"); + die("clean.requireForce %s to true and neither -n nor -f given; " + "refusing to clean", config_set ? "set" : "defaults"); if (force > 1) rm_flags = 0; |