diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-10 07:10:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-10 07:10:18 (GMT) |
| commit | f69714c38c6f3296a4bfba0d057e0f1605373f49 (patch) | |
| tree | 2d850f14f62d33ed514e2b197b63fe459ff20d37 /Makefile | |
| parent | edee414c3e5a546aae3dd1529f397df949713305 (diff) | |
| parent | c35a7b8d806317dc1762e36561cbd31c2530dd9c (diff) | |
| download | git-f69714c38c6f3296a4bfba0d057e0f1605373f49.zip git-f69714c38c6f3296a4bfba0d057e0f1605373f49.tar.gz git-f69714c38c6f3296a4bfba0d057e0f1605373f49.tar.bz2 | |
Merge with master.
This merges commit
c35a7b8d806317dc1762e36561cbd31c2530dd9c
from master into our head commit
edee414c3e5a546aae3dd1529f397df949713305
Sincerely,
jit-merge command.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -70,6 +70,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 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 \ |