Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
commite6634ec9add6641cc19cc8e0fad2cff98ce10228
authorJakub Narebski <jnareb@gmail.com>
Tue, 26 Apr 2011 10:57:09 +0000 (26 12:57 +0200)
committerJakub Narebski <jnareb@gmail.com>
Tue, 26 Apr 2011 10:57:09 +0000 (26 12:57 +0200)
treee7c6cc3984412305fdd3cf30d5ba07ea7727e5ca
parent2f2fc30559ebbd4d938a0d1dcf6093f6c134ffe8
parentec014eac0e9e6f30cbbca616090fa2ecf74797e7
Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git:
  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"