Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
commit278d65ffffb15d7b0256d966ca97f961d2e2f44d
authorJakub Narebski <jnareb@gmail.com>
Sat, 13 Feb 2010 09:51:56 +0000 (13 10:51 +0100)
committerJakub Narebski <jnareb@gmail.com>
Sat, 13 Feb 2010 09:51:56 +0000 (13 10:51 +0100)
tree666c5095b5ef54eab4a2cc83da787b28a2d4d85c
parentd1524ff5a125511c50fd7207bad49e1990c8f709
parente923eaeb901ff056421b9007adcbbce271caa7b6
Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git:
  Git 1.7.0
  Fix typo in 1.6.6.2 release notes
  Re-fix check-ref-format documentation mark-up
  archive documentation: attributes are taken from the tree by default
  Documentation: minor fixes to RelNotes-1.7.0
  bash: support 'git am's new '--continue' option