Merge branch 'js/notes'
commit7b75b331f6744fbf953fe8913703378ef86a2189
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 03:40:39 +0000 (5 19:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 03:40:39 +0000 (5 19:40 -0800)
tree25154056da08462508e529a7ba92073775d295fd
parent5d680a67d7909c89af96eba4a2d77abed606292b
parent22a3d060937072b0f197a8084af879c753c68fe7
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
.gitignore
Documentation/config.txt
Makefile
cache.h
commit.c
pretty.c