diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-06 03:40:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-06 03:40:39 (GMT) |
| commit | 7b75b331f6744fbf953fe8913703378ef86a2189 (patch) | |
| tree | 25154056da08462508e529a7ba92073775d295fd /Makefile | |
| parent | 5d680a67d7909c89af96eba4a2d77abed606292b (diff) | |
| parent | 22a3d060937072b0f197a8084af879c753c68fe7 (diff) | |
| download | git-7b75b331f6744fbf953fe8913703378ef86a2189.zip git-7b75b331f6744fbf953fe8913703378ef86a2189.tar.gz git-7b75b331f6744fbf953fe8913703378ef86a2189.tar.bz2 | |
Merge branch 'js/notes'
* js/notes:
git-notes: fix printing of multi-line notes
notes: fix core.notesRef documentation
Add an expensive test for git-notes
Speed up git notes lookup
Add a script to edit/inspect notes
Introduce commit notes
Conflicts:
pretty.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -265,6 +265,7 @@ 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 @@ -377,6 +378,7 @@ 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 @@ -459,6 +461,7 @@ 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 |