From: Junio C Hamano <junkio@cox.net>
Date: Wed, 31 May 2006 21:26:39 +0000 (-0700)
Subject: Merge branch 'ff/svnimport' into next
X-Git-Tag: v1.4.1-rc1~50
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=100c25f3cf7ddf3d47c39fb721b20424bd78c650;p=git.git

Merge branch 'ff/svnimport' into next

* ff/svnimport:
  git-svnimport: Improved detection of merges.
  Improved pack format documentation.
  git_exec_path, execv_git_cmd: ignore empty environment variables
  execv_git_cmd: Fix stack buffer overflow.
  Fixed Cygwin CR-munging problem in mailsplit
---

100c25f3cf7ddf3d47c39fb721b20424bd78c650