diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-21 07:53:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-21 07:53:55 (GMT) |
| commit | 885d492f69a80ae3e91c1310a63caf0aeb567f2a (patch) | |
| tree | 3240d00b6c56d2ea55daad2d18103e7b4d3cf89f /environment.c | |
| parent | 905bf7742cf5f4a6dea2e75ba2dbd89d5dfaa793 (diff) | |
| parent | a099469bbcf273e76d81573229971956b4ef0700 (diff) | |
| download | git-885d492f69a80ae3e91c1310a63caf0aeb567f2a.zip git-885d492f69a80ae3e91c1310a63caf0aeb567f2a.tar.gz git-885d492f69a80ae3e91c1310a63caf0aeb567f2a.tar.bz2 | |
Merge branch 'jh/notes' (early part)
* 'jh/notes' (early part):
Add selftests verifying concatenation of multiple notes for the same commit
Refactor notes code to concatenate multiple notes annotating the same object
Add selftests verifying that we can parse notes trees with various fanouts
Teach the notes lookup code to parse notes trees with various fanout schemes
Teach notes code to free its internal data structures on request
Add '%N'-format for pretty-printing commit notes
Add flags to get_commit_notes() to control the format of the note string
t3302-notes-index-expensive: Speed up create_repo()
fast-import: Add support for importing commit notes
Teach "-m <msg>" and "-F <file>" to "git notes edit"
Add an expensive test for git-notes
Speed up git notes lookup
Add a script to edit/inspect notes
Introduce commit notes
Conflicts:
.gitignore
Documentation/pretty-formats.txt
pretty.c
Diffstat (limited to 'environment.c')
| -rw-r--r-- | environment.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c index 5de6837..571ab56 100644 --- a/environment.c +++ b/environment.c @@ -49,6 +49,7 @@ enum push_default_type push_default = PUSH_DEFAULT_MATCHING; #define OBJECT_CREATION_MODE OBJECT_CREATION_USES_HARDLINKS #endif enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE; +char *notes_ref_name; int grafts_replace_parents = 1; /* Parallel index stat data preload? */ |