From: Junio C Hamano <junkio@cox.net>
Date: Wed, 28 Feb 2007 06:15:42 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~122
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c4f8f827555dcbbee148fd1daa4821533ead2ea2;p=git.git

Merge branch 'maint'

* maint:
  builtin-fmt-merge-msg: fix bugs in --file option
  index-pack: Loop over pread until data loading is complete.
  blameview: Fix the browse behavior in blameview
  Fix minor typos/grammar in user-manual.txt
  Correct ordering in git-cvsimport's option documentation
  git-show: Reject native ref
  Fix git-show man page formatting in the EXAMPLES section
---

c4f8f827555dcbbee148fd1daa4821533ead2ea2