![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 19 Jul 2010 18:21:08 +0000 (11:21 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 19 Jul 2010 18:21:08 +0000 (11:21 -0700) | ||
| commit | c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68 | |
| tree | ef8e9686d647a7e47a6c999cfbca6d0e14bcb1c4 | tree | snapshot |
| parent | f0e5a4b7f3db2d4e1ded9683817d1d1d3a2a220f | commit | diff |
| parent | c173dad58787a7f11a526dbcdaa5a2fe9ff1c87f | commit | diff |
Merge branch 'maint'
* maint:
update-server-info: Shorten read_pack_info_file()
Documentation: Explain git-mergetool's use of temporary files
* maint:
update-server-info: Shorten read_pack_info_file()
Documentation: Explain git-mergetool's use of temporary files