Merge branch 'maint' to sync with 1.6.5.7
commita1bb8f45f1590f812badceea0b7c120074ec3e85
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Dec 2009 19:09:31 +0000 (16 11:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Dec 2009 20:47:15 +0000 (16 12:47 -0800)
tree3ce41a927bcca4baa26680cc33c79aa15fdc4795
parente25e2b4201716a912b29397515a858238497dbdd
parent527b9d704d929a2fff2f9bf1c5e2856725c1416d
Merge branch 'maint' to sync with 1.6.5.7

* maint:
  Git 1.6.5.7
  worktree: don't segfault with an absolute pathspec without a work tree
  ignore unknown color configuration
  help.autocorrect: do not run a command if the command given is junk
  Illustrate "filter" attribute with an example
Documentation/git.txt
builtin-branch.c
builtin-commit.c
diff.c
setup.c