From: Junio C Hamano <junkio@cox.net>
Date: Sat, 24 Jun 2006 08:06:51 +0000 (-0700)
Subject: Merge branch 'pb/error'
X-Git-Tag: v1.4.1-rc2~34
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bc1f262d67cbe1c736c5dca911f6f085f47ac9bb;p=git.git

Merge branch 'pb/error'

* pb/error:
  usage: minimum type fix.
  Customizable error handlers
  git-merge: Don't use -p when outputting summary
  git-commit: allow -e option anywhere on command line
  patch-id: take "commit" prefix as well as "diff-tree" prefix
---

bc1f262d67cbe1c736c5dca911f6f085f47ac9bb