From: Junio C Hamano <junkio@cox.net>
Date: Wed, 24 May 2006 21:08:30 +0000 (-0700)
Subject: Merge branch 'master' into lt/apply
X-Git-Tag: v1.4.0-rc1~44^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4868f3729acce2aa9512ded7179a895cc50f64c8;p=git.git

Merge branch 'master' into lt/apply

* master: (40 commits)
  Clean up sha1 file writing
  Builtin git-cat-file
  builtin format-patch: squelch content-type for 7-bit ASCII
  CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.
  add more informative error messages to git-mktag
  remove the artificial restriction tagsize < 8kb
  git-rebase: use canonical A..B syntax to format-patch
  git-format-patch: now built-in.
  fmt-patch: Support --attach
  fmt-patch: understand old <his> notation
  Teach fmt-patch about --keep-subject
  Teach fmt-patch about --numbered
  fmt-patch: implement -o <dir>
  fmt-patch: output file names to stdout
  Teach fmt-patch to write individual files.
  Use RFC2822 dates from "git fmt-patch".
  git-fmt-patch: thinkofix to show [PATCH] properly.
  rename internal format-patch wip
  Minor tweak on subject line in --pretty=email
  Tentative built-in format-patch.
  ...
---

4868f3729acce2aa9512ded7179a895cc50f64c8