Merge branch 'ms/subtree-fixlets' into maint
commit4208fa5ce44a746edb582898dfa49b2bfa84dbcc
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Jan 2013 19:17:10 +0000 (8 11:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Jan 2013 19:17:10 +0000 (8 11:17 -0800)
tree093354c1d443cd7cea62a58e057882e719686484
parentb48b632cda2d8f74524c448027e867089ddcb44a
parent248a8849fa649e7404192cec00635026604a6750
Merge branch 'ms/subtree-fixlets' into maint

* ms/subtree-fixlets:
  git-subtree: fix typo in manpage
  git-subtree: ignore git-subtree executable