Merge branch 'master' of git://repo.or.cz/alt-git
commit50e9887ab2b746f3df8a378884b30907577c1c15
authorJohannes Sixt <johannes.sixt@telecom.at>
Mon, 3 Sep 2007 06:58:50 +0000 (3 08:58 +0200)
committerJohannes Sixt <johannes.sixt@telecom.at>
Mon, 3 Sep 2007 06:58:50 +0000 (3 08:58 +0200)
treef4c696f65a1945cebc5e24bfa2f7dc8865e98817
parentfce2bf8842e8224822619afabff1bfcfc3546436
parent86bab9615c3516d4ac7756ae3c1285d331b78f04
Merge branch 'master' of git://repo.or.cz/alt-git

This is an evil merge that fixes up the port handling of ssh:// URLs in
connect.c.
Makefile
builtin-init-db.c
cache.h
connect.c
diff.c
gitk