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

diff --cc Documentation/git.txt
Simple merge

diff --cc builtin-branch.c
Simple merge

diff --cc builtin-commit.c
Simple merge

diff --cc diff.c
index d952686926e2e97aab3e369ad192027b4d7e676b,72f25b52847e0a170e01b2b5aa9600f2e39a3d5d..08bbd3e9070996b38f4d34cedf7640d93aa5808d
--- 1/diff.c
--- 2/diff.c
+++ b/diff.c
@@@ -61,9 -59,7 +61,9 @@@ static int parse_diff_color_slot(const 
                return DIFF_COMMIT;
        if (!strcasecmp(var+ofs, "whitespace"))
                return DIFF_WHITESPACE;
-       die("bad config variable '%s'", var);
 +      if (!strcasecmp(var+ofs, "func"))
 +              return DIFF_FUNCINFO;
+       return -1;
  }
  
  static int git_config_rename(const char *var, const char *value)

diff --cc setup.c
Simple merge