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

Merge branch 'cc/replace'

Browse Source 
* cc/replace:
  t6050: check pushing something based on a replaced commit
  Documentation: add documentation for "git replace"
  Add git-replace to .gitignore
  builtin-replace: use "usage_msg_opt" to give better error messages
  parse-options: add new function "usage_msg_opt"
  builtin-replace: teach "git replace" to actually replace
  Add new "git replace" command
  environment: add global variable to disable replacement
  mktag: call "check_sha1_signature" with the replacement sha1
  replace_object: add a test case
  object: call "check_sha1_signature" with the replacement sha1
  sha1_file: add a "read_sha1_file_repl" function
  replace_object: add mechanism to replace objects found in "refs/replace/"
  refs: add a "for_each_replace_ref" function
This commit is contained in:
Junio C Hamano
2009-08-21 18:47:53 -07:00
parent 5e092b5bce 4e65b538ac
commit f00ecbe42b
23 changed files with 610 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
parse-options.c
View File

@ -549,6 +549,14 @@ void usage_with_options(const char * const *usagestr,
exit(129);
}
void usage_msg_opt(const char *msg,
const char * const *usagestr,
const struct option *options)
{
fprintf(stderr, "%s\n\n", msg);
usage_with_options(usagestr, options);
}
int parse_options_usage(const char * const *usagestr,
const struct option *opts)
{