| author | Jacob Keller <jacob.keller@gmail.com> |
|---|---|
| Mon, 17 Aug 2015 21:33:34 +0000 (14:33 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Mon, 17 Aug 2015 22:39:13 +0000 (15:39 -0700) | |
| commit | 4f655e2...b76fed49b0c32bcdcd899934215b9a6d |
| tree | e48e126...e1150c5c24d21c6cba74e9c2048bd162 (tree) |
| parent | d2d68d9...75da4a15dfca0e6e59001948e5bf57f9 (diff) |
| Documentation/config.txt | diff | blob | history | |
| Documentation/git-notes.txt | diff | blob | history | |
| builtin/notes.c | diff | blob | history | |
| t/t3309-notes-merge-auto-resolve.sh | diff | blob | history |