summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-02-22 17:15:01 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-02-22 17:15:01 -0800
commitf6b39fe779bc72d49aa30936c6371d76401fc753 (patch)
treec91f4ead6d4cf465faddfca87e5857875c2b8b46 /Makefile
parentMerge master to get fixes up to GIT 1.2.3 (diff)
parentgit-rm: Fix to properly handle files with spaces, tabs, newlines, etc. (diff)
downloadtgif-f6b39fe779bc72d49aa30936c6371d76401fc753.tar.xz
Merge branch 'cw/remove' into next
* cw/remove: git-rm: Fix to properly handle files with spaces, tabs, newlines, etc. Add new git-rm command with documentation
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e2fba9583c..8e6bbcecbf 100644
--- a/Makefile
+++ b/Makefile
@@ -120,7 +120,7 @@ SCRIPT_SH = \
git-merge-one-file.sh git-parse-remote.sh \
git-prune.sh git-pull.sh git-push.sh git-rebase.sh \
git-repack.sh git-request-pull.sh git-reset.sh \
- git-resolve.sh git-revert.sh git-sh-setup.sh \
+ git-resolve.sh git-revert.sh git-rm.sh git-sh-setup.sh \
git-tag.sh git-verify-tag.sh git-whatchanged.sh \
git-applymbox.sh git-applypatch.sh git-am.sh \
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \