diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-07-19 11:21:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-07-19 11:21:08 -0700 |
commit | c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68 (patch) | |
tree | ef8e9686d647a7e47a6c999cfbca6d0e14bcb1c4 /convert.c | |
parent | git add: Add --ignore-missing to SYNOPSIS (diff) | |
parent | update-server-info: Shorten read_pack_info_file() (diff) | |
download | tgif-c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68.tar.xz |
Merge branch 'maint'
* maint:
update-server-info: Shorten read_pack_info_file()
Documentation: Explain git-mergetool's use of temporary files
Diffstat (limited to 'convert.c')
0 files changed, 0 insertions, 0 deletions