Merge branch 'maint'

* maint:
  add -p: warn if only binary changes present
  git-archive: work in bare repos
  git-svn: change dashed git-config to git config
This commit is contained in:
Junio C Hamano
2008-10-26 16:21:08 -07:00
5 changed files with 31 additions and 5 deletions

View File

@@ -336,5 +336,7 @@ int write_archive(int argc, const char **argv, const char *prefix,
parse_treeish_arg(argv, &args, prefix);
parse_pathspec_arg(argv + 1, &args);
git_config(git_default_config, NULL);
return ar->write_archive(&args);
}