summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Josh Triplett <josh@freedesktop.org>2007-04-23 17:18:16 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-04-23 22:13:50 -0700
commit2122591b3b5c6d93d3052a3151afcfa3146ede84 (patch)
tree59d0c98999b5021f2e9816d01fdc0d4efbdd079c /git-mergetool.sh
parentt6030: grab commit object name as we go (diff)
downloadtgif-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 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions