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

1  2 
Documentation/git-read-tree.txt
unpack-trees.c

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