Merge branch 'maint-1.8.1' into maint
commitf7b1ad870c46c53685ef83efbfd7d9ca1983a191
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 20:46:42 +0000 (25 13:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 20:46:42 +0000 (25 13:46 -0700)
tree3d37b13993699ccd8f1bebc1b4b93546da3e9bda
parent04fe1184fd0611bf26785b365dd344b8f7d72861
parent7c1017d2d56112b88be2b6fa6d2a57a12ee2ffb4
Merge branch 'maint-1.8.1' into maint

* maint-1.8.1:
  bundle: Add colons to list headings in "verify"
  bundle: Fix "verify" output if history is complete
  Documentation: filter-branch env-filter example
  git-filter-branch.txt: clarify ident variables usage
  git-compat-util.h: Provide missing netdb.h definitions
  describe: Document --match pattern format
  Documentation/githooks: Explain pre-rebase parameters
  update-index: list supported idx versions and their features
  diff-options: unconfuse description of --color
  read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr()
  index-format.txt: mention of v4 is missing in some places
Documentation/diff-options.txt
Documentation/git-describe.txt
Documentation/git-filter-branch.txt
Documentation/git-update-index.txt
Documentation/githooks.txt
Documentation/technical/index-format.txt
git-compat-util.h
read-cache.c