diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-20 06:23:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-20 06:23:56 (GMT) |
| commit | 0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9 (patch) | |
| tree | 999ed87a9453af4848bf98a3341ceaf0801c6f95 /merge-recursive.h | |
| parent | edf9d719d1d05c1eb4f652782febfdfede212648 (diff) | |
| parent | bebd2fd77d385f198017fe297a6c79e26b2bf61c (diff) | |
| download | git-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 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index 981ed6a..7e1e972 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -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; |