diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-25 14:22:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-25 14:22:00 -0700 |
| commit | a3c6459ab6610d93da8c95000d0ffc803ce39892 (patch) | |
| tree | ade7727a3e71d67afb9319b77c8c47eace8f83e7 /builtin/merge-recursive.c | |
| parent | The second batch (diff) | |
| parent | builtin: also setup gently for --help-all (diff) | |
| download | git-a3c6459ab6610d93da8c95000d0ffc803ce39892.tar.gz git-a3c6459ab6610d93da8c95000d0ffc803ce39892.zip | |
Merge branch 'dk/help-all'
"git cmd --help-all" now works outside repositories.
* dk/help-all:
builtin: also setup gently for --help-all
parse-options: refactor flags for usage_with_options_internal
Diffstat (limited to 'builtin/merge-recursive.c')
| -rw-r--r-- | builtin/merge-recursive.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index 03b5100cfa..17aa4db37a 100644 --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@ -38,7 +38,8 @@ int cmd_merge_recursive(int argc, if (argv[0] && ends_with(argv[0], "-subtree")) o.subtree_shift = ""; - if (argc == 2 && !strcmp(argv[1], "-h")) { + if (argc == 2 && (!strcmp(argv[1], "-h") || + !strcmp(argv[1], "--help-all"))) { struct strbuf msg = STRBUF_INIT; strbuf_addf(&msg, builtin_merge_recursive_usage, argv[0]); show_usage_if_asked(argc, argv, msg.buf); |