From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Feb 2009 03:40:39 +0000 (-0800)
Subject: Merge branch 'js/notes'
X-Git-Tag: v1.6.2-rc0~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b75b331f6744fbf953fe8913703378ef86a2189;p=git.git

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
---

7b75b331f6744fbf953fe8913703378ef86a2189
diff --cc pretty.c
index cc460b569,2d2872f3b..8d4dbc9fb
--- a/pretty.c
+++ b/pretty.c
@@@ -6,7 -6,7 +6,8 @@@
  #include "string-list.h"
  #include "mailmap.h"
  #include "log-tree.h"
+ #include "notes.h"
 +#include "color.h"
  
  static char *user_format;