From: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue, 3 May 2011 04:02:15 +0000 (-0500)
Subject: Merge commit 'v1.7.5' into svn-fe
X-Git-Tag: v1.7.10-rc0~118^2~4^2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=59445b0b02c731872c8665ac7e9cf1226fa616e4;p=git.git

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"
  ...
---

59445b0b02c731872c8665ac7e9cf1226fa616e4