Merge refs/heads/master from .

diff --combined Makefile
index 797c27fb04b950275c99a6449527658ccbe33a9b,4d1c11166e9b625e3a94bafcd1efa6c321028404..adb4965f4921735aec1985ba6f169c96a12c7442
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -32,7 -32,7 +32,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
 -GIT_VERSION = 0.99.4
 +GIT_VERSION = 0.99.5
  
  CFLAGS = -g -O2 -Wall
  ALL_CFLAGS = $(CFLAGS) $(DEFINES)
@@@ -64,13 -64,14 +64,14 @@@ SCRIPTS=git git-apply-patch-script git-
        git-reset-script git-add-script git-checkout-script git-clone-script \
        gitk git-cherry git-rebase-script git-relink-script git-repack-script \
        git-format-patch-script git-sh-setup-script git-push-script \
-       git-branch-script git-parse-remote git-verify-tag-script \
+       git-branch-script git-parse-remote-script git-verify-tag-script \
        git-ls-remote-script git-clone-dumb-http git-rename-script \
        git-request-pull-script git-bisect-script
  
  SCRIPTS += git-count-objects-script
  # SCRIPTS += git-send-email-script
  SCRIPTS += git-revert-script
+ SCRIPTS += git-octopus-script
  
  PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \