Merge branch 'jh/notes-add-ui'
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2011 22:58:32 +0000 (15:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2011 22:58:32 +0000 (15:58 -0700)
commit2d23c64ba2e91029f4ce932117a1772378d63cf3
tree3ed1df7f43cbb310aab98f6f57e61011fe1c11c0
parentc67e367c50304c5a0701ae2bb8ecb7291f481ffd
parent84a7e35eea97388ba5ca458808119650818c2fd2
Merge branch 'jh/notes-add-ui'

* jh/notes-add-ui:
  Make "git notes add" more user-friendly when there are existing notes

Conflicts:
builtin/notes.c
builtin/notes.c