Code

Merge branch 'maint-1.7.6' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:09:28 +0000 (16:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:09:28 +0000 (16:09 -0700)
* 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

1  2 
Documentation/config.txt
unpack-trees.c

Simple merge
diff --cc unpack-trees.c
Simple merge