Merge master changes into rc.

diff --git a/Makefile b/Makefile
index ff3d7e3fadd5b0eb8e41e59462e0542f1e162ee1..1623247273d2ec13e65fc74ecfca49b7e578ff2e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -71,6 +71,7 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
 SCRIPTS += git-count-objects-script
 # SCRIPTS += git-send-email-script
 SCRIPTS += git-revert-script
+SCRIPTS += git-show-branches-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 \