diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-06 04:40:39 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-06 04:40:39 +0100 |
| commit | 7b75b331f6744fbf953fe8913703378ef86a2189 (patch) | |
| tree | 25154056da08462508e529a7ba92073775d295fd /cache.h | |
| parent | Merge branch 'jc/refuse-push-to-current' (diff) | |
| parent | git-notes: fix printing of multi-line notes (diff) | |
| download | git-7b75b331f6744fbf953fe8913703378ef86a2189.tar.xz git-7b75b331f6744fbf953fe8913703378ef86a2189.zip | |
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 'cache.h')
| -rw-r--r-- | cache.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -371,6 +371,8 @@ static inline enum object_type object_type(unsigned int mode) #define GITATTRIBUTES_FILE ".gitattributes" #define INFOATTRIBUTES_FILE "info/attributes" #define ATTRIBUTE_MACRO_PREFIX "[attr]" +#define GIT_NOTES_REF_ENVIRONMENT "GIT_NOTES_REF" +#define GIT_NOTES_DEFAULT_REF "refs/notes/commits" extern int is_bare_repository_cfg; extern int is_bare_repository(void); @@ -542,6 +544,7 @@ enum rebase_setup_type { extern enum branch_track git_branch_track; extern enum rebase_setup_type autorebase; +extern char *notes_ref_name; #define GIT_REPO_VERSION 0 extern int repository_format_version; |