From: Junio C Hamano Date: Mon, 21 Jun 2010 12:39:16 +0000 (-0700) Subject: Merge branch 'jn/notes-doc' into maint X-Git-Tag: v1.7.2-rc0~7^2~27 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1b9fa0e81134df5c067efc1e3413f05c9e5043f8;p=git.git Merge branch 'jn/notes-doc' into maint * 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 --- 1b9fa0e81134df5c067efc1e3413f05c9e5043f8