| author | Michael J Gruber <git@drmicha.warpmail.net> | 
|---|---|
| Mon, 23 Jun 2014 07:05:47 +0000 (09:05 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> | 
| Mon, 23 Jun 2014 22:50:29 +0000 (15:50 -0700) | |
| commit | 01e57b5...91b0c9f2ac93708c5c2cbcd4731ddd34 | 
| tree | 6cac894...a32b4a22c3c4e78d41a538f77b78a590(tree) | 
| parent | 0953113...b5687f42bcdfc3d20dd3a125784ad383(diff) | 
| builtin/merge.c | diff | blob | history | |
| gpg-interface.c | diff | blob | history | |
| gpg-interface.h | diff | blob | history | |
| pretty.c | diff | blob | history |