Merge branch 'jk/notes-merge-from-anywhere'
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Feb 2016 22:15:59 +0000 (14:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Feb 2016 22:15:59 +0000 (14:15 -0800)
commit1cb3ed3...8dcfaa6084b8aed075c772aeb9e57243
tree75a9536...7071b4785887ef6c251be09df45d46d9copy hash to clipboard (tree)
parent0175655...5f969c26c43443d998a1283cac843d10copy hash to clipboard (diff)
parentb3715b7...226668e26f1f2abe7e2f93cdbbf6e2f5copy hash to clipboard (diff)
builtin/notes.c
notes.c
notes.h