summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-23 19:58:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-23 19:58:23 (GMT)
commit9d76db4e677772fc71d114090076e28c34770261 (patch)
treebff62b16f5c7992bf140266593cc3293b3fa96a8
parent31a199a76e086f8931237b352ddcb7ba2b617481 (diff)
parent059a500d25162370afef6a7afe8a4e61f40eb2f3 (diff)
downloadgit-9d76db4e677772fc71d114090076e28c34770261.zip
git-9d76db4e677772fc71d114090076e28c34770261.tar.gz
git-9d76db4e677772fc71d114090076e28c34770261.tar.bz2
Merge branch 'jc/maint-blame-minimal'
"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. * jc/maint-blame-minimal: blame: accept --need-minimal
-rw-r--r--builtin/blame.c1
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 },