diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-22 01:47:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-22 01:47:53 (GMT) |
| commit | f00ecbe42b82f3c8e6a170074f2299487026e400 (patch) | |
| tree | fca98c6ac1d4cde3d5e60d296b2fcae8caf7fc6b /parse-options.c | |
| parent | 5e092b5bcea48c098af7000f888a2a0f16c9db77 (diff) | |
| parent | 4e65b538acc97dd853e19a1692893f5fd47043e6 (diff) | |
| download | git-f00ecbe42b82f3c8e6a170074f2299487026e400.zip git-f00ecbe42b82f3c8e6a170074f2299487026e400.tar.gz git-f00ecbe42b82f3c8e6a170074f2299487026e400.tar.bz2 | |
Merge branch 'cc/replace'
* 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
Diffstat (limited to 'parse-options.c')
| -rw-r--r-- | parse-options.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/parse-options.c b/parse-options.c index 3b71fbb..a64a4d6 100644 --- a/parse-options.c +++ b/parse-options.c @@ -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) { |