diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-19 18:21:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-19 18:21:08 (GMT) |
| commit | c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68 (patch) | |
| tree | ef8e9686d647a7e47a6c999cfbca6d0e14bcb1c4 /setup.c | |
| parent | f0e5a4b7f3db2d4e1ded9683817d1d1d3a2a220f (diff) | |
| parent | c173dad58787a7f11a526dbcdaa5a2fe9ff1c87f (diff) | |
| download | git-c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68.zip git-c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68.tar.gz git-c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68.tar.bz2 | |
Merge branch 'maint'
* maint:
update-server-info: Shorten read_pack_info_file()
Documentation: Explain git-mergetool's use of temporary files
Diffstat (limited to 'setup.c')
0 files changed, 0 insertions, 0 deletions