summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-23 07:07:17 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-23 07:07:17 (GMT)
commit89305da8a230e435109cc97ed88241c158813523 (patch)
tree099925d87bdb82a735df5f857a724e3e067ac40b /Makefile
parent15ac5164427d838d9377643dcdd03edd770cf001 (diff)
parentf5e375c9a99d731c05eef701f119da85d62fc158 (diff)
downloadgit-89305da8a230e435109cc97ed88241c158813523.zip
git-89305da8a230e435109cc97ed88241c158813523.tar.gz
git-89305da8a230e435109cc97ed88241c158813523.tar.bz2
Merge refs/heads/master from .
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c0a8429..797c27f 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,6 @@ 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 \
@@ -84,7 +83,7 @@ PROG= git-update-cache git-diff-files git-init-db git-write-tree \
git-diff-stages git-rev-parse git-patch-id git-pack-objects \
git-unpack-objects git-verify-pack git-receive-pack git-send-pack \
git-prune-packed git-fetch-pack git-upload-pack git-clone-pack \
- git-show-index git-daemon git-var git-peek-remote \
+ git-show-index git-daemon git-var git-peek-remote git-show-branch \
git-update-server-info git-show-rev-cache git-build-rev-cache
ifndef NO_CURL