From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 13 Apr 2008 02:17:51 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc0~148
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f;p=git.git

Merge branch 'maint'

* maint:
  t7401: squelch garbage output
  Documentation/git-submodule: typofix
  Fix config key miscount in url.*.insteadOf
  Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
  Document -w option to shortlog
  bisect: report bad rev better
---

f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f