From: Junio C Hamano Date: Thu, 27 Apr 2006 19:25:18 +0000 (-0700) Subject: Merge branch 'master' into next X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=e431e4cd7d4f496ceefc374c7c922d8ff1d910bd;p=git.git Merge branch 'master' into next * master: Fix "git help -a" terminal autosizing diff-index: fix compilation warnings. --- e431e4cd7d4f496ceefc374c7c922d8ff1d910bd