diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-09 10:22:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-09 10:22:23 -0700 |
| commit | edee414c3e5a546aae3dd1529f397df949713305 (patch) | |
| tree | 665e1e695501289a63272c3de89aed3eb555ed74 /Makefile | |
| parent | c3958a7926ab20b90fe0767580b466698477f5b6 (diff) | |
| parent | f10e0e0b18c8e2e69535e7380fb3c1f9b097cfda (diff) | |
| download | git-edee414c3e5a546aae3dd1529f397df949713305.tar.gz | |
Merge with master.
This merges commit
f10e0e0b18c8e2e69535e7380fb3c1f9b097cfda
from master into our head commit
c3958a7926ab20b90fe0767580b466698477f5b6
Sincerely,
jit-merge command.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -69,7 +69,7 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \ git-request-pull-script git-bisect-script SCRIPTS += git-count-objects-script -SCRIPTS += git-send-email-script +# SCRIPTS += git-send-email-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 \ |