summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-20 06:23:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-20 06:23:56 (GMT)
commit0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9 (patch)
tree999ed87a9453af4848bf98a3341ceaf0801c6f95 /diff.h
parentedf9d719d1d05c1eb4f652782febfdfede212648 (diff)
parentbebd2fd77d385f198017fe297a6c79e26b2bf61c (diff)
downloadgit-0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9.zip
git-0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9.tar.gz
git-0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9.tar.bz2
Merge branch 'jk/merge-rename-ux'
* jk/merge-rename-ux: pull: propagate --progress to merge merge: enable progress reporting for rename detection add inexact rename detection progress infrastructure commit: stop setting rename limit bump rename limit defaults (again) merge: improve inexact rename limit warning
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index 310bd6b..007a055 100644
--- a/diff.h
+++ b/diff.h
@@ -110,7 +110,8 @@ struct diff_options {
int pickaxe_opts;
int rename_score;
int rename_limit;
- int warn_on_too_large_rename;
+ int needed_rename_limit;
+ int show_rename_progress;
int dirstat_percent;
int setup;
int abbrev;