Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
commit9884ca5e6ec623a3a25470cd4508255ceed2aaea
authorJakub Narebski <jnareb@gmail.com>
Mon, 2 May 2011 22:11:14 +0000 (3 00:11 +0200)
committerJakub Narebski <jnareb@gmail.com>
Mon, 2 May 2011 22:11:14 +0000 (3 00:11 +0200)
tree60601e2a0acc62ed692a8aa7a097efbf077ffd13
parentb0984745e3249ac282cef727f5a90c2378ca04c7
parent791a765e54b9b4c8d2cf4f069222e31cef8aa24e
Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git:
  Update draft release notes to 1.7.6
  strbuf: clarify assertion in strbuf_setlen()
  git-svn.txt: small typeface improvements
  git-svn.txt: move option descriptions
  git-svn.txt: fix usage of --add-author-from