Merge branch 'maint'
commit934f788981de941814e821217f32451a5c715d5d
authorJunio C Hamano <gitster@pobox.com>
Sun, 8 Mar 2009 06:34:13 +0000 (7 22:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 8 Mar 2009 06:34:13 +0000 (7 22:34 -0800)
treeb98d42ef8c9606b34f9b9389d2d65190db1ecc37
parent113106e06c48cc80432fd1be8af912898e8f240e
parent9a6682bab5e800465f0a4e44cdf18fe396ff4f6d
Merge branch 'maint'

* maint:
  builtin-revert.c: release index lock when cherry-picking an empty commit
  document config --bool-or-int
  t1300: use test_must_fail as appropriate
  cleanup: add isascii()
  Documentation: fix badly indented paragraphs in "--bisect-all" description
Documentation/git-config.txt
pretty.c