diff options
| author | Josh Triplett <josh@freedesktop.org> | 2007-04-23 17:18:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-23 22:13:50 -0700 |
| commit | 2122591b3b5c6d93d3052a3151afcfa3146ede84 (patch) | |
| tree | 59d0c98999b5021f2e9816d01fdc0d4efbdd079c /Documentation | |
| parent | ab69e89c7e95f309564c3967222bd39f0587a74c (diff) | |
| download | git-2122591b3b5c6d93d3052a3151afcfa3146ede84.tar.gz git-2122591b3b5c6d93d3052a3151afcfa3146ede84.tar.xz | |
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 <josh@freedesktop.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-clean.txt | 6 |
2 files changed, 9 insertions, 1 deletions
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.<name>.merge:: branch.<name>.merge to the desired branch, and use the special setting `.` (a period) for branch.<name>.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] [--] <paths>... +'git-clean' [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>... 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. |