Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 27 Apr 2006 19:25:18 +0000 (12:25 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 27 Apr 2006 19:25:18 +0000 (12:25 -0700)
* master:
  Fix "git help -a" terminal autosizing
  diff-index: fix compilation warnings.

1  2 
git.c

diff --cc git.c
Simple merge