diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:30 -0800 |
| commit | 532d983823b19e0f7c0df0a70abcb237a06b2870 (patch) | |
| tree | 84caccfb74fc2689d572430302c01a95fb7a7f22 | |
| parent | Merge branch 'mr/clone-dir-exists-to-path-exists' (diff) | |
| parent | builtin/blame.c: remove '--indent-heuristic' from usage string (diff) | |
| download | tgif-532d983823b19e0f7c0df0a70abcb237a06b2870.tar.xz | |
Merge branch 'sg/blame-indent-heuristics-is-now-the-default'
Message update.
* sg/blame-indent-heuristics-is-now-the-default:
builtin/blame.c: remove '--indent-heuristic' from usage string
| -rw-r--r-- | builtin/blame.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 10185ccdc6..bf1cecdf3f 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -861,14 +861,6 @@ int cmd_blame(int argc, const char **argv, const char *prefix) OPT_STRING_LIST(0, "ignore-revs-file", &ignore_revs_file_list, N_("file"), N_("Ignore revisions from <file>")), OPT_BIT(0, "color-lines", &output_option, N_("color redundant metadata from previous line differently"), OUTPUT_COLOR_LINE), OPT_BIT(0, "color-by-age", &output_option, N_("color lines by age"), OUTPUT_SHOW_AGE_WITH_COLOR), - - /* - * The following two options are parsed by parse_revision_opt() - * and are only included here to get included in the "-h" - * output: - */ - { OPTION_LOWLEVEL_CALLBACK, 0, "indent-heuristic", NULL, NULL, N_("Use an experimental heuristic to improve diffs"), PARSE_OPT_NOARG, NULL, 0, parse_opt_unknown_cb }, - OPT_BIT(0, "minimal", &xdl_opts, N_("Spend extra cycles to find better match"), XDF_NEED_MINIMAL), OPT_STRING('S', NULL, &revs_file, N_("file"), N_("Use revisions from <file> instead of calling git-rev-list")), OPT_STRING(0, "contents", &contents_from, N_("file"), N_("Use <file>'s contents as the final image")), |