diff options
author | Junio C Hamano <junkio@cox.net> | 2005-08-24 16:56:48 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-08-24 16:56:48 -0700 |
commit | 434d6ba03122c160f98713a009cf8a32d02982f3 (patch) | |
tree | c4b0963078c63407448b58e961ed81e32a1d14c6 /Makefile | |
parent | 168cc639adb29616bde22f97f153faa1dfd024eb (diff) | |
parent | c95173410d6f290e65c15232e56f4963f8279ef1 (diff) | |
download | git-434d6ba03122c160f98713a009cf8a32d02982f3.tar.gz |
Merge refs/heads/master from .
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -64,13 +64,14 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \ 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 \ |