diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-02-05 19:40:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-05 19:40:39 -0800 |
| commit | 7b75b331f6744fbf953fe8913703378ef86a2189 (patch) | |
| tree | 25154056da08462508e529a7ba92073775d295fd /Documentation/config.txt | |
| parent | Merge branch 'jc/refuse-push-to-current' (diff) | |
| parent | git-notes: fix printing of multi-line notes (diff) | |
| download | tgif-7b75b331f6744fbf953fe8913703378ef86a2189.tar.xz | |
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 '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 e2b8775dd3..7fbf64d24c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -422,6 +422,19 @@ relatively high IO latencies. With this set to 'true', git will do the index comparison to the filesystem data in parallel, allowing overlapping IO's. +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. + alias.*:: Command aliases for the linkgit:git[1] command wrapper - e.g. after defining "alias.last = cat-file commit HEAD", the invocation |