aboutsummaryrefslogtreecommitdiff
path: root/builtin/blame.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-21 05:38:50 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-21 05:38:50 -0700
commit60335534a6ac52d4d3a372a5b56df5a57a4463d1 (patch)
tree8d61494762039a2268c3116574841fe71181054b /builtin/blame.c
parente1ba0f6340c1d72677c7792a0a82ecf05363026e (diff)
parent582aa00bdffb27abcf1b27d541b4c231a395d3b8 (diff)
downloadgit-60335534a6ac52d4d3a372a5b56df5a57a4463d1.tar.gz
git-60335534a6ac52d4d3a372a5b56df5a57a4463d1.tar.xz
Merge branch 'rs/diff-no-minimal' into maint
* rs/diff-no-minimal: git diff too slow for a file
Diffstat (limited to 'builtin/blame.c')
-rw-r--r--builtin/blame.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 4dd4c3f49..8506286dd 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -39,7 +39,7 @@ static int show_root;
static int reverse;
static int blank_boundary;
static int incremental;
-static int xdl_opts = XDF_NEED_MINIMAL;
+static int xdl_opts;
static enum date_mode blame_date_mode = DATE_ISO8601;
static size_t blame_date_width;