From: Junio C Hamano <junkio@cox.net>
Date: Thu, 23 Feb 2006 01:15:01 +0000 (-0800)
Subject: Merge branch 'cw/remove' into next
X-Git-Tag: v1.3.0-rc1~54^2~42
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f6b39fe779bc72d49aa30936c6371d76401fc753?ds=inline;hp=-c

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
---

f6b39fe779bc72d49aa30936c6371d76401fc753
diff --combined Makefile
index e2fba9583c,5d2ec1f111..8e6bbcecbf
--- a/Makefile
+++ b/Makefile
@@@ -120,7 -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 \
@@@ -130,7 -130,6 +130,7 @@@
  SCRIPT_PERL = \
  	git-archimport.perl git-cvsimport.perl git-relink.perl \
  	git-shortlog.perl git-fmt-merge-msg.perl git-rerere.perl \
 +	git-annotate.perl git-cvsserver.perl \
  	git-svnimport.perl git-mv.perl git-cvsexportcommit.perl
  
  SCRIPT_PYTHON = \
@@@ -165,7 -164,7 +165,7 @@@ PROGRAMS = 
  	git-upload-pack$X git-verify-pack$X git-write-tree$X \
  	git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
  	git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
 -	git-describe$X git-merge-tree$X
 +	git-describe$X git-merge-tree$X git-blame$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)