diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:53:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:53:55 -0800 |
| commit | 885d492f69a80ae3e91c1310a63caf0aeb567f2a (patch) | |
| tree | 3240d00b6c56d2ea55daad2d18103e7b4d3cf89f /Documentation/config.txt | |
| parent | 905bf7742cf5f4a6dea2e75ba2dbd89d5dfaa793 (diff) | |
| parent | a099469bbcf273e76d81573229971956b4ef0700 (diff) | |
| download | git-885d492f69a80ae3e91c1310a63caf0aeb567f2a.tar.gz git-885d492f69a80ae3e91c1310a63caf0aeb567f2a.tar.xz | |
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 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 1ff21938e..78ee90631 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -456,6 +456,19 @@ On some file system/operating system combinations, this is unreliable. Set this config setting to 'rename' there; However, This will remove the check that makes sure that existing object files will not get overwritten. +core.notesRef:: + When showing commit messages, also show notes which are stored in + the given ref. This ref is expected to contain files named + after the full SHA-1 of the commit they annotate. ++ +If such a file exists in the given ref, the referenced blob is read, and +appended to the commit message, separated by a "Notes:" line. If the +given ref itself does not exist, it is not an error, but means that no +notes should be printed. ++ +This setting defaults to "refs/notes/commits", and can be overridden by +the `GIT_NOTES_REF` environment variable. + add.ignore-errors:: Tells 'git-add' to continue adding files when some files cannot be added due to indexing errors. Equivalent to the '--ignore-errors' |