diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:09:28 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:09:28 -0700 |
commit | 411e6cf1971936ba31ffa142a6d5dc5c06dc8f7a (patch) | |
tree | f3b8758bc896acb1e557a4cd83b3167341e1d006 /Documentation/config.txt | |
parent | 982d1dce349732539780ee81bb79c8ab26eaed20 (diff) | |
parent | 588150b0231ee342ed528292a2205f4049b3dcb1 (diff) | |
download | git-411e6cf1971936ba31ffa142a6d5dc5c06dc8f7a.tar.gz |
Merge branch 'maint-1.7.6' into maint
* maint-1.7.6:
make the sample pre-commit hook script reject names with newlines, too
git-read-tree.txt: update sparse checkout examples
git-read-tree.txt: correct sparse-checkout and skip-worktree description
git-read-tree.txt: language and typography fixes
unpack-trees: print "Aborting" to stderr
Documentation/git-update-index: refer to 'ls-files'
Documentation: basic configuration of notes.rewriteRef
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 0658ffb889..0781341d6b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1453,7 +1453,8 @@ notes.rewriteRef:: You may also specify this configuration several times. + Does not have a default value; you must configure this variable to -enable note rewriting. +enable note rewriting. Set it to `refs/notes/commits` to enable +rewriting for the default commit notes. + This setting can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable, which must be a colon separated list of refs or |