Merge refs/heads/master from .

diff --combined Makefile
index 57d4f1170c06bfff42cb64a753741fd4fa6fa37c,007d42b0383f3c8dbc9dba703260b9d1e785fac7..f13ff5aa29ef9ade4d9652c970b79053b47d2d0d
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -32,7 -32,7 +32,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
 -GIT_VERSION = 0.99.5
 +GIT_VERSION = 0.99.6
  
  CFLAGS = -g -O2 -Wall
  ALL_CFLAGS = $(CFLAGS) $(DEFINES)
@@@ -57,7 -57,7 +57,7 @@@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__pow
  
  
  
- SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
+ SCRIPTS=git git-merge-one-file-script git-prune-script \
        git-pull-script git-tag-script git-resolve-script git-whatchanged \
        git-fetch-script git-status-script git-commit-script \
        git-log-script git-shortlog git-cvsimport-script git-diff-script \
@@@ -215,6 -215,7 +215,7 @@@ check
  install: $(PROG) $(SCRIPTS)
        $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
        $(INSTALL) $(PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
+       $(INSTALL) git-revert-script $(DESTDIR)$(bindir)/git-cherry-pick-script
        $(MAKE) -C templates install
        $(MAKE) -C tools install