diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-02 04:11:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 04:11:49 (GMT) |
| commit | 089c0ca8b6b1375336477e5011619c18a59b83e3 (patch) | |
| tree | cfbbb27e1724a09440e5ff602640e956fd94507b /builtin | |
| parent | 35977f2316d68faa850222e19d4baec407511756 (diff) | |
| parent | 059a500d25162370afef6a7afe8a4e61f40eb2f3 (diff) | |
| download | git-089c0ca8b6b1375336477e5011619c18a59b83e3.zip git-089c0ca8b6b1375336477e5011619c18a59b83e3.tar.gz git-089c0ca8b6b1375336477e5011619c18a59b83e3.tar.bz2 | |
Merge branch 'jc/maint-blame-minimal' into maint
"git blame" started missing quite a few changes from the origin since we
stopped using the diff minimalization by default in v1.7.2 era.
Teach "--minimal" option to "git blame" to work around this regression.
* jc/maint-blame-minimal:
blame: accept --need-minimal
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/blame.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index b35bd62..324d476 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2302,6 +2302,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix) OPT_BIT('s', NULL, &output_option, "Suppress author name and timestamp (Default: off)", OUTPUT_NO_AUTHOR), OPT_BIT('e', "show-email", &output_option, "Show author email instead of name (Default: off)", OUTPUT_SHOW_EMAIL), OPT_BIT('w', NULL, &xdl_opts, "Ignore whitespace differences", XDF_IGNORE_WHITESPACE), + OPT_BIT(0, "minimal", &xdl_opts, "Spend extra cycles to find better match", XDF_NEED_MINIMAL), OPT_STRING('S', NULL, &revs_file, "file", "Use revisions from <file> instead of calling git-rev-list"), OPT_STRING(0, "contents", &contents_from, "file", "Use <file>'s contents as the final image"), { OPTION_CALLBACK, 'C', NULL, &opt, "score", "Find line copies within and across files", PARSE_OPT_OPTARG, blame_copy_callback }, |