summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-11 05:31:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-11 05:32:10 (GMT)
commit954cfb5cfd17d57b9b31b19b73efe73199407e07 (patch)
treef3baaaf7f25372b96e206b2bc3c8dd3940919433 /Makefile
parentf1c8a48a2de69bfc9837c53f2c52ffbe7239dc3e (diff)
downloadgit-954cfb5cfd17d57b9b31b19b73efe73199407e07.zip
git-954cfb5cfd17d57b9b31b19b73efe73199407e07.tar.gz
git-954cfb5cfd17d57b9b31b19b73efe73199407e07.tar.bz2
Revert "Merge branch 'js/notes'"
This reverts commit 7b75b331f6744fbf953fe8913703378ef86a2189, reversing changes made to 5d680a67d7909c89af96eba4a2d77abed606292b.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 0 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 27b9569..627d4d0 100644
--- a/Makefile
+++ b/Makefile
@@ -265,7 +265,6 @@ SCRIPT_SH += git-merge-octopus.sh
SCRIPT_SH += git-merge-one-file.sh
SCRIPT_SH += git-merge-resolve.sh
SCRIPT_SH += git-mergetool.sh
-SCRIPT_SH += git-notes.sh
SCRIPT_SH += git-parse-remote.sh
SCRIPT_SH += git-pull.sh
SCRIPT_SH += git-quiltimport.sh
@@ -378,7 +377,6 @@ LIB_H += ll-merge.h
LIB_H += log-tree.h
LIB_H += mailmap.h
LIB_H += merge-recursive.h
-LIB_H += notes.h
LIB_H += object.h
LIB_H += pack.h
LIB_H += pack-refs.h
@@ -461,7 +459,6 @@ LIB_OBJS += match-trees.o
LIB_OBJS += merge-file.o
LIB_OBJS += merge-recursive.o
LIB_OBJS += name-hash.o
-LIB_OBJS += notes.o
LIB_OBJS += object.o
LIB_OBJS += pack-check.o
LIB_OBJS += pack-refs.o