Merge branch 'jk/doc-fsck'
commita4c628d71d43a00acbf42ff5704d9f812babc39d
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Dec 2011 19:27:27 +0000 (22 11:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Dec 2011 19:27:27 +0000 (22 11:27 -0800)
tree511604f33552ccfb92bf5dcc4c48999afb816660
parentf35ccd9be2db9a55afd09ed1a9338c758fa63d82
parent28303082609cb7efbdac87d45bf3a18c80eb8e70
Merge branch 'jk/doc-fsck'

* jk/doc-fsck:
  docs: brush up obsolete bits of git-fsck manpage

Conflicts:
Documentation/git-fsck.txt
Documentation/git-fsck.txt