From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Dec 2007 05:38:28 +0000 (-0800)
Subject: Merge branch 'wc/add-i'
X-Git-Tag: v1.5.4-rc0~77
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ab7d70766963e1e854a1edcbb0b840242330a7cb;p=git.git

Merge branch 'wc/add-i'

* wc/add-i:
  git-add -i: add help text for list-and-choose UI
  add -i: allow prefix highlighting for "Add untracked" as well.
  Highlight keyboard shortcuts in git-add--interactive
  Document all help keys in "git add -i" patch mode.
  Add "--patch" option to git-add--interactive
  add -i: Fix running from a subdirectory
  builtin-add: fix command line building to call interactive
  git-add -i: allow multiple selection in patch subcommand
  Add path-limiting to git-add--interactive
  Teach builtin-add to pass multiple paths to git-add--interactive
---

ab7d70766963e1e854a1edcbb0b840242330a7cb
diff --cc builtin-commit.c
index e635d9963,45e51b1d5..2ec822313
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@@ -601,9 -576,9 +601,9 @@@ int cmd_status(int argc, const char **a
  
  	git_config(git_status_config);
  
 -	argc = parse_and_validate_options(argc, argv);
 +	argc = parse_and_validate_options(argc, argv, builtin_status_usage);
  
- 	index_file = prepare_index(argv, prefix);
+ 	index_file = prepare_index(argc, argv, prefix);
  
  	commitable = run_status(stdout, index_file, prefix);
  
@@@ -701,9 -668,9 +701,9 @@@ int cmd_commit(int argc, const char **a
  
  	git_config(git_commit_config);
  
 -	argc = parse_and_validate_options(argc, argv);
 +	argc = parse_and_validate_options(argc, argv, builtin_commit_usage);
  
- 	index_file = prepare_index(argv, prefix);
+ 	index_file = prepare_index(argc, argv, prefix);
  
  	if (!no_verify && run_hook(index_file, "pre-commit", NULL)) {
  		rollback_index_files();