From: Junio C Hamano Date: Mon, 29 Oct 2007 19:53:54 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Tag: v1.5.4-rc0~310 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e2b7eaf0ca3897940961d23392d4ff718867ea9f;p=git.git Merge branch 'maint' * maint: RelNotes-1.5.3.5: describe recent fixes merge-recursive.c: mrtree in merge() is not used before set sha1_file.c: avoid gcc signed overflow warnings Fix a small memory leak in builtin-add honor the http.sslVerify option in shell scripts --- e2b7eaf0ca3897940961d23392d4ff718867ea9f