Merge branch 'master' into next
commit5aa4db0b8880b08be34e551daa4a200e00edb271
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 22:28:47 +0000 (15 15:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 22:28:47 +0000 (15 15:28 -0700)
tree93cd7e28e71e816c05f596d68cf40ab6a2ef8cf3
parent8ebcb706c4adb788726ba045853b11a9817ac4d4
parenta62eafb0aaf3fa8265744954d6f0c2c7c7f97682
Merge branch 'master' into next

* master:
  Update draft release notes to 1.7.5
  Documentation: running test with --debug keeps "trash" directory
  docs: point git.txt author credits to git-scm.com
  doc: add missing git footers
  doc: drop author/documentation sections from most pages
Documentation/git-difftool.txt
Documentation/git-log.txt
Documentation/git-mergetool.txt
Documentation/git-rebase.txt
Documentation/git-rerere.txt
Documentation/git-rev-list.txt