From: Junio C Hamano <junkio@cox.net>
Date: Sat, 3 Jun 2006 01:17:35 +0000 (-0700)
Subject: Merge branch 'ds/doc' into jc/fmt-patch
X-Git-Tag: v1.4.0-rc1~14^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2f164c35fa8915ddd8e8a01809a9935ad900f13c;p=git-core%2Fgit.git

Merge branch 'ds/doc' into jc/fmt-patch

* ds/doc:
  Update documentation for git-format-patch
  sha1_file: avoid re-preparing duplicate packs
  handle concurrent pruning of packed objects
  http: prevent segfault during curl handle reuse
  Remove possible segfault in http-fetch.
  gitk: show_error fix
  [PATCH] gitk: start-up bugfix
  [PATCH] gitk: Replace "git-" commands with "git "
  [PATCH] gitk: Display commit messages with word wrap
  gitk: Fix bug where page-up/down wouldn't always work properly
  gitk: Fix display of "(...)" for parents/children we haven't drawn
  send-email: only 'require' instead of 'use' Net::SMTP
  Allow multiple -m options to git-commit.
---

2f164c35fa8915ddd8e8a01809a9935ad900f13c