Merge branch 'ff/svnimport' into next
commit100c25f3cf7ddf3d47c39fb721b20424bd78c650
authorJunio C Hamano <junkio@cox.net>
Wed, 31 May 2006 21:26:39 +0000 (31 14:26 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 31 May 2006 21:26:39 +0000 (31 14:26 -0700)
treec4a0cd4264166f61f24efab6496523f2ab40af73
parent422dfaf079eec92ec75ef8f766d66404433ad0b1
parent65160b8b04f814ab5b2573b32605320ff875f99e
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