Merge branch 'maint-1.5.4' into maint
commitd6d96f835cace1c108100cf88e216a59debcb937
authorJunio C Hamano <gitster@pobox.com>
Sat, 12 Apr 2008 22:41:19 +0000 (12 15:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 12 Apr 2008 22:41:19 +0000 (12 15:41 -0700)
treef5d347de6193849ad4cec2b52d35e225d9c1e9e9
parenteed81838f0d0e031702473e1d427d71055134edd
parente80950786c16e642be76976a8926b2846ba0aa4f
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
  Document -w option to shortlog
  bisect: report bad rev better
builtin-shortlog.c
git-bisect.sh