![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Aug 2011 21:22:26 +0000 (14:22 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Aug 2011 21:22:26 +0000 (14:22 -0700) | ||
| commit | 50b68aeb392537a730a86349293acf046a778b74 | |
| tree | 94d8d5442ef56da82a0b3c7ba50f82ffc87553c8 | tree | snapshot |
| parent | b91766295f2b873bbd4ef79c06de05aff27f8e12 | commit | diff |
| parent | 8499644ea7af87c02f9b878f162aa6facbd5b8a7 | commit | diff |
Merge branch 'maint'
* maint:
Prepare for 1.7.6.1
am: refresh the index at start and --resolved
Conflicts:
GIT-VERSION-GEN
RelNotes
* maint:
Prepare for 1.7.6.1
am: refresh the index at start and --resolved
Conflicts:
GIT-VERSION-GEN
RelNotes
| git-am.sh | diff1 | | diff2 | | blob | history |