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
This commit is contained in:
Junio C Hamano
2011-03-19 23:23:56 -07:00
9 changed files with 49 additions and 10 deletions

View File

@ -20,6 +20,8 @@ struct merge_options {
int diff_rename_limit;
int merge_rename_limit;
int rename_score;
int needed_rename_limit;
int show_rename_progress;
int call_depth;
struct strbuf obuf;
struct string_list current_file_set;