aboutsummaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-21 00:18:27 -0700
committerJunio C Hamano <junkio@cox.net>2005-09-24 23:50:44 -0700
commit8082d8d3050e3fdd7b0f13c7a7b3ad68af7f478a (patch)
tree6939780586028325f91f5193c56ba42eafef179c /diff.h
parent6b5ee137e56af8093391411389dd4b18416707ec (diff)
downloadgit-8082d8d3050e3fdd7b0f13c7a7b3ad68af7f478a.tar.gz
git-8082d8d3050e3fdd7b0f13c7a7b3ad68af7f478a.tar.xz
Diff: -l<num> to limit rename/copy detection.
When many paths are modified, rename detection takes a lot of time. The new option -l<num> can be used to disable rename detection when more than <num> paths are possibly created as renames. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/diff.h b/diff.h
index 5800f15a3..2e3287090 100644
--- a/diff.h
+++ b/diff.h
@@ -21,6 +21,7 @@ struct diff_options {
int pickaxe_opts;
int rename_score;
int reverse_diff;
+ int rename_limit;
int setup;
};
@@ -61,23 +62,22 @@ extern void diffcore_std_no_resolve(struct diff_options *);
#define COMMON_DIFF_OPTIONS_HELP \
"\ncommon diff options:\n" \
-" -r diff recursively (only meaningful in diff-tree)\n" \
-" -z output diff-raw with lines terminated with NUL.\n" \
-" -p output patch format.\n" \
-" -u synonym for -p.\n" \
-" --name-only show only names of changed files.\n" \
-" --name-only-z\n" \
-" same as --name-only but terminate lines with NUL.\n" \
-" -R swap input file pairs.\n" \
-" -B detect complete rewrites.\n" \
-" -M detect renames.\n" \
-" -C detect copies.\n" \
+" -r diff recursively (only meaningful in diff-tree)\n" \
+" -z output diff-raw with lines terminated with NUL.\n" \
+" -p output patch format.\n" \
+" -u synonym for -p.\n" \
+" --name-only show only names of changed files.\n" \
+" -R swap input file pairs.\n" \
+" -B detect complete rewrites.\n" \
+" -M detect renames.\n" \
+" -C detect copies.\n" \
" --find-copies-harder\n" \
-" try unchanged files as candidate for copy detection.\n" \
-" -O<file> reorder diffs according to the <file>.\n" \
-" -S<string> find filepair whose only one side contains the string.\n" \
+" try unchanged files as candidate for copy detection.\n" \
+" -l<n> limit rename attempts up to <n> paths.\n" \
+" -O<file> reorder diffs according to the <file>.\n" \
+" -S<string> find filepair whose only one side contains the string.\n" \
" --pickaxe-all\n" \
-" show all files diff when -S is used and hit is found.\n"
+" show all files diff when -S is used and hit is found.\n"
extern int diff_queue_is_empty(void);