summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-24 16:31:34 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-24 16:31:34 -0800
commit6c6ea3800d1eace51994d90fbeb19ffe918e63b0 (patch)
tree5a47df1dd62703aa0bef43431a8b31977fb17129 /Makefile
parentab002e34e26c39a716dc80359450f739ba907122 (diff)
parent1617adc7a074415413b2f48da72f43d5c6cd74c4 (diff)
downloadgit-6c6ea3800d1eace51994d90fbeb19ffe918e63b0.tar.gz
Merge branch 'sb/clean'
* sb/clean: Teach git clean to use setup_standard_excludes() git-clean: Fix error message if clean.requireForce is not set. Make git-clean a builtin
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index bcf1e9eb29..8809b0ace6 100644
--- a/Makefile
+++ b/Makefile
@@ -213,7 +213,7 @@ BASIC_LDFLAGS =
SCRIPT_SH = \
git-bisect.sh git-checkout.sh \
- git-clean.sh git-clone.sh git-commit.sh \
+ git-clone.sh git-commit.sh \
git-ls-remote.sh \
git-merge-one-file.sh git-mergetool.sh git-parse-remote.sh \
git-pull.sh git-rebase.sh git-rebase--interactive.sh \
@@ -330,6 +330,7 @@ BUILTIN_OBJS = \
builtin-check-attr.o \
builtin-checkout-index.o \
builtin-check-ref-format.o \
+ builtin-clean.o \
builtin-commit-tree.o \
builtin-count-objects.o \
builtin-describe.o \