mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/merge-rename-ux'

Browse Source 
* 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
parent edf9d719d1 bebd2fd77d
commit 0ce6a51b43
9 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
diff.h
View File

@ -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;