Merge branch 'master' into next
commitedc085aa3990903c5033a3960fc208ac7cccd46e
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Mar 2009 07:06:17 +0000 (13 00:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Mar 2009 07:06:17 +0000 (13 00:06 -0700)
tree3d0dae82283e51841aad4d52a26dc54a4ae08863
parentc3f22ebf100bb8922c1223c683872064d6c6994b
parent924189d6a2d13b18fbfdaa1725569957cf628807
Merge branch 'master' into next

* master:
  Documentation: filter-branch: show --ignore-unmatch in main index-filter example
  contrib/difftool: use a separate config namespace for difftool commands
  Update release notes to 1.6.3