Merge commit 'v1.7.5' into svn-fe
commit59445b0b02c731872c8665ac7e9cf1226fa616e4
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 3 May 2011 04:02:15 +0000 (2 23:02 -0500)
committerJonathan Nieder <jrnieder@gmail.com>
Tue, 3 May 2011 04:02:15 +0000 (2 23:02 -0500)
tree93922cf13ed9c62859dac628fa7e376977a23d24
parent6908e999468d7eb531a1609cee37673c5d3ca04f
parentec014eac0e9e6f30cbbca616090fa2ecf74797e7
Merge commit 'v1.7.5' into svn-fe

* commit 'v1.7.5': (436 commits)
  Git 1.7.5
  Git 1.7.5-rc3
  Git 1.7.4.5
  git-svn.txt: Document --mergeinfo
  Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"
  ...