diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:23:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:23:56 -0700 |
| commit | 0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9 (patch) | |
| tree | 999ed87a9453af4848bf98a3341ceaf0801c6f95 /builtin/commit.c | |
| parent | edf9d719d1d05c1eb4f652782febfdfede212648 (diff) | |
| parent | bebd2fd77d385f198017fe297a6c79e26b2bf61c (diff) | |
| download | git-0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9.tar.gz git-0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9.tar.xz | |
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 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 82092e5c8..de0e11137 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1285,7 +1285,6 @@ static void print_summary(const char *prefix, const unsigned char *sha1) get_commit_format(format.buf, &rev); rev.always_show_header = 0; rev.diffopt.detect_rename = 1; - rev.diffopt.rename_limit = 100; rev.diffopt.break_opt = 0; diff_setup_done(&rev.diffopt); |