| author | Jacob Keller <jacob.keller@gmail.com> |
|---|---|
| Mon, 17 Aug 2015 21:33:33 +0000 (14:33 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Mon, 17 Aug 2015 22:38:54 +0000 (15:38 -0700) | |
| commit | d2d68d9...75da4a15dfca0e6e59001948e5bf57f9 |
| tree | f72d519...0d953932d25a8095a504e814d2ffc871 (tree) |
| parent | 11dd2b2...9a3303bd1e32fd2ee95ec5dff38d9d47 (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 |