summaryrefslogtreecommitdiff
path: root/parse-options.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-22 01:47:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-22 01:47:53 (GMT)
commitf00ecbe42b82f3c8e6a170074f2299487026e400 (patch)
treefca98c6ac1d4cde3d5e60d296b2fcae8caf7fc6b /parse-options.h
parent5e092b5bcea48c098af7000f888a2a0f16c9db77 (diff)
parent4e65b538acc97dd853e19a1692893f5fd47043e6 (diff)
downloadgit-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.h')
-rw-r--r--parse-options.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/parse-options.h b/parse-options.h
index b32587a..f295a2c 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -145,6 +145,10 @@ extern int parse_options(int argc, const char **argv, const char *prefix,
extern NORETURN void usage_with_options(const char * const *usagestr,
const struct option *options);
+extern NORETURN void usage_msg_opt(const char *msg,
+ const char * const *usagestr,
+ const struct option *options);
+
/*----- incremental advanced APIs -----*/
enum {