From 2122591b3b5c6d93d3052a3151afcfa3146ede84 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Mon, 23 Apr 2007 17:18:16 -0700 Subject: Add clean.requireForce option, and add -f option to git-clean to override it Add a new configuration option clean.requireForce. If set, git-clean will refuse to run, unless forced with the new -f option, or not acting due to -n. Signed-off-by: Josh Triplett Signed-off-by: Junio C Hamano --- Documentation/config.txt | 4 ++++ Documentation/git-clean.txt | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/config.txt b/Documentation/config.txt index b13ff3a1b..e0aff5369 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -300,6 +300,10 @@ branch..merge:: branch..merge to the desired branch, and use the special setting `.` (a period) for branch..remote. +clean.requireForce:: + A boolean to make git-clean do nothing unless given -f or -n. Defaults + to false. + color.branch:: A boolean to enable/disable color in the output of gitlink:git-branch[1]. May be set to `true` (or `always`), diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt index c61afbcdb..5aff026eb 100644 --- a/Documentation/git-clean.txt +++ b/Documentation/git-clean.txt @@ -8,7 +8,7 @@ git-clean - Remove untracked files from the working tree SYNOPSIS -------- [verse] -'git-clean' [-d] [-n] [-q] [-x | -X] [--] ... +'git-clean' [-d] [-f] [-n] [-q] [-x | -X] [--] ... DESCRIPTION ----------- @@ -25,6 +25,10 @@ OPTIONS -d:: Remove untracked directories in addition to untracked files. +-f:: + If the git configuration specifies clean.forceRequire as true, + git-clean will refuse to run unless given -f or -n. + -n:: Don't actually remove anything, just show what would be done. -- cgit v1.2.1