Merge branch 'master' into next
commit91b321f5e4cd2f907df5dce38456a29f57a838d4
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Jul 2014 21:27:30 +0000 (30 14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Jul 2014 21:27:30 +0000 (30 14:27 -0700)
tree96d4c327eeecd1a16e9f467802b6561bb54dc144
parentfbdcabe3ee4652186b0b2370eb0646ec0abf433e
parentaa544bfbc6eb11e4f0471f3144d3e3ac75c0e4a9
Merge branch 'master' into next

* master:
  Update draft release notes to 2.1
  Git 2.0.4
  commit --amend: test specifies authorship but forgets to check
Documentation/git.txt