Merge branch 'maint-1.7.6' into maint
commit411e6cf1971936ba31ffa142a6d5dc5c06dc8f7a
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:09:28 +0000 (26 16:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:09:28 +0000 (26 16:09 -0700)
treef3b8758bc896acb1e557a4cd83b3167341e1d006
parent982d1dce349732539780ee81bb79c8ab26eaed20
parent588150b0231ee342ed528292a2205f4049b3dcb1
Merge branch 'maint-1.7.6' into maint

* maint-1.7.6:
  make the sample pre-commit hook script reject names with newlines, too
  git-read-tree.txt: update sparse checkout examples
  git-read-tree.txt: correct sparse-checkout and skip-worktree description
  git-read-tree.txt: language and typography fixes
  unpack-trees: print "Aborting" to stderr
  Documentation/git-update-index: refer to 'ls-files'
  Documentation: basic configuration of notes.rewriteRef
Documentation/config.txt
unpack-trees.c