From: Junio C Hamano <junkio@cox.net>
Date: Wed, 13 Dec 2006 05:52:19 +0000 (-0800)
Subject: Merge branch 'master' into js/merge
X-Git-Tag: v1.5.0-rc0~127^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8042ed1cebd37419ff38f540482355c0f1d30936;p=git.git

Merge branch 'master' into js/merge

* master: (42 commits)
  git-svn: correctly handle packed-refs in refs/remotes/
  add test case for recursive merge
  git-svn: correctly display fatal() error messages
  git-svn: allow dcommit to take an alternate head
  git-svn: enable logging of information not supported by git
  Clarify fetch error for missing objects.
  Move Fink and Ports check to after config file
  shortlog: fix segfault on empty authorname
  shortlog: remove "[PATCH]" prefix from shortlog output
  Make sure the empty tree exists when needed in merge-recursive.
  Don't use memcpy when source and dest. buffers may overlap
  no need to install manpages as executable
  Documentation: simpler shared repository creation
  shortlog: fix segfault on empty authorname
  Add branch.*.merge warning and documentation update
  Fix perl/ build.
  git-svn: use do_switch for --follow-parent if the SVN library supports it
  Fix documentation copy&paste typo
  git-svn: extra error check to ensure we open a file correctly
  Documentation: update git-clone man page with new behavior
  ...
---

8042ed1cebd37419ff38f540482355c0f1d30936