diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-07 17:02:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-07 17:02:07 -0700 |
| commit | 9673198ee867cea4ed70d2cf54c1a2eb8f27bb46 (patch) | |
| tree | f06a5be02102b0a78f56e18beffa8fa5c3e70b6e /builtin-commit-tree.c | |
| parent | 96bc4de85cf810db5c7cd94bf0688a98a64a0bc7 (diff) | |
| parent | 7c49cb288173ab5264b3b9e4257aeeb13388334c (diff) | |
| download | git-9673198ee867cea4ed70d2cf54c1a2eb8f27bb46.tar.xz | |
Merge branch 'master' into pb/gitpm
This is to resolve the conflicts with Ryan's annotate updates early.
Diffstat (limited to 'builtin-commit-tree.c')
| -rw-r--r-- | builtin-commit-tree.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin-commit-tree.c b/builtin-commit-tree.c index ec082bf754..9c98796671 100644 --- a/builtin-commit-tree.c +++ b/builtin-commit-tree.c @@ -77,7 +77,7 @@ static int new_parent(int idx) return 1; } -int cmd_commit_tree(int argc, const char **argv, char **envp) +int cmd_commit_tree(int argc, const char **argv, const char *prefix) { int i; int parents = 0; @@ -88,8 +88,6 @@ int cmd_commit_tree(int argc, const char **argv, char **envp) unsigned int size; setup_ident(); - setup_git_directory(); - git_config(git_default_config); if (argc < 2) |