From: Junio C Hamano Date: Sun, 13 Jun 2010 18:21:06 +0000 (-0700) Subject: Merge branch 'jn/notes-doc' X-Git-Tag: v1.7.2-rc0~84 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/95e42a64a9e713bcc3c4590fb933c93d37342322 Merge branch 'jn/notes-doc' * jn/notes-doc: Documentation/notes: nitpicks Documentation/notes: clean up description of rewriting configuration Documentation/notes: simplify treatment of default display refs Documentation/log: add a CONFIGURATION section Documentation/notes: simplify treatment of default notes ref Documentation/notes: add configuration section Documentation/notes: describe content of notes blobs Documentation/notes: document format of notes trees --- 95e42a64a9e713bcc3c4590fb933c93d37342322