summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJosh Triplett <josh@freedesktop.org>2007-04-23 17:18:16 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-23 22:13:50 -0700
commit2122591b3b5c6d93d3052a3151afcfa3146ede84 (patch)
tree59d0c98999b5021f2e9816d01fdc0d4efbdd079c /Documentation/config.txt
parentab69e89c7e95f309564c3967222bd39f0587a74c (diff)
downloadgit-2122591b3b5c6d93d3052a3151afcfa3146ede84.tar.gz
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/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index b13ff3a1bb..e0aff5369f 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`),