mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/opt-filename'

Browse Source 
* sb/opt-filename:
  parse-opts: add OPT_FILENAME and transition builtins
  parse-opts: prepare for OPT_FILENAME

Conflicts:
	builtin-log.c
This commit is contained in:
Junio C Hamano
2009-05-31 16:57:42 -07:00
parent 714cdcd03e df217ed643
commit f9275c68af
52 changed files with 144 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-cat-file.c
View File

@ -231,7 +231,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
if (argc != 3 && argc != 2)
usage_with_options(cat_file_usage, options);
argc = parse_options(argc, argv, options, cat_file_usage, 0);
argc = parse_options(argc, argv, prefix, options, cat_file_usage, 0);
if (opt) {
if (argc == 1)