From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Apr 2009 07:42:23 +0000 (-0700)
Subject: Merge branch 'sb/format-patch-patchname'
X-Git-Tag: v1.6.3-rc0~32
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=87d2062b3984af5347519c38877b99bce06e6e8d;p=git.git

Merge branch 'sb/format-patch-patchname'

* sb/format-patch-patchname:
  format_sanitized_subject: Don't trim past initial length of strbuf
  log-tree: fix patch filename computation in "git format-patch"
  format-patch: --numbered-files and --stdout aren't mutually exclusive
  format-patch: --attach/inline uses filename instead of SHA1
  format-patch: move get_patch_filename() into log-tree
  format-patch: pass a commit to reopen_stdout()
  format-patch: construct patch filename in one function
  pretty.c: add %f format specifier to format_commit_message()
---

87d2062b3984af5347519c38877b99bce06e6e8d