Merge branch 'jk/notes-merge-config'
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Aug 2015 22:39:05 +0000 (15:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Aug 2015 22:39:05 +0000 (15:39 -0700)
commit5b6211a...e1f042a6961ef8a6bd8286db51bfc513
tree45e6790...cc7705d569c35418bef0ade2c2436c22copy hash to clipboard (tree)
parentd75bb73...cf2ecce38c147980aac0cbc27a6b838acopy hash to clipboard (diff)
parent4f655e2...b76fed49b0c32bcdcd899934215b9a6dcopy hash to clipboard (diff)
Documentation/config.txt
builtin/notes.c