Merge branch 'jk/help-alias'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Feb 2008 19:55:43 +0000 (11:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Feb 2008 19:55:43 +0000 (11:55 -0800)
* jk/help-alias:
  help: respect aliases
  make alias lookup a public, procedural function
  help: use parseopt

1  2 
Makefile
cache.h

diff --cc Makefile
Simple merge
diff --cc cache.h
Simple merge