aboutsummaryrefslogtreecommitdiffstats
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-03 11:01:20 -0700
committerJunio C Hamano <gitster@pobox.com>2015-08-03 11:01:20 -0700
commit2dded96052114c7b902d90f80f75a30eb64d860a (patch)
treef8c7116edec1c72755cf3f1f62176a9acbc5a2ec /diff.h
parentMerge branch 'gp/status-rebase-i-info' (diff)
parentlog: add "log.follow" configuration variable (diff)
downloadgit-2dded96052114c7b902d90f80f75a30eb64d860a.tar.gz
git-2dded96052114c7b902d90f80f75a30eb64d860a.zip
Merge branch 'dt/log-follow-config'
Add a new configuration variable to enable "--follow" automatically when "git log" is run with one pathspec argument. * dt/log-follow-config: log: add "log.follow" configuration variable
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index c7ad42addf..f7208ad103 100644
--- a/diff.h
+++ b/diff.h
@@ -91,6 +91,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data)
#define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28)
#define DIFF_OPT_FUNCCONTEXT (1 << 29)
#define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30)
+#define DIFF_OPT_DEFAULT_FOLLOW_RENAMES (1 << 31)
#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
#define DIFF_OPT_TOUCHED(opts, flag) ((opts)->touched_flags & DIFF_OPT_##flag)