Merge branch 'master' into sp/reflog
commita5c8a98ca7e978c334e956df7ae2165c75c494da
authorJunio C Hamano <junkio@cox.net>
Wed, 24 May 2006 23:49:24 +0000 (24 16:49 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 24 May 2006 23:49:24 +0000 (24 16:49 -0700)
treedf77e4b7b652a72f6bb862e81a55f95692eda55a
parent6858d494926437ad7b7e9199ea39953eb90c7bab
parent84c667ff97da2a3864ef7952b9f438d133ce35ef
Merge branch 'master' into sp/reflog

* master: (90 commits)
  fetch.c: remove an unused variable and dead code.
  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.
  built-in tar-tree and remote tar-tree
  Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree.
  Builtin git-show-branch.
  Builtin git-apply.
  ...
Documentation/git-branch.txt
Documentation/git-checkout.txt
cache.h
fetch.c
fetch.h
git-am.sh
git-commit.sh