Merge branch 'kk/maint-commit-tree'

* kk/maint-commit-tree:
  Revert "git-commit-tree(1): update synopsis"
  commit-tree: resurrect command line parsing updates
This commit is contained in:
Junio C Hamano
2012-07-23 20:55:53 -07:00
3 changed files with 18 additions and 4 deletions

View File

@ -48,9 +48,6 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
if (argc < 2 || !strcmp(argv[1], "-h"))
usage(commit_tree_usage);
if (get_sha1_tree(argv[1], tree_sha1))
die("Not a valid tree object name %s", argv[1]);
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
if (!strcmp(arg, "-p")) {