Make git-cherry-pick in target "all"

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index 5800f15..2f4a7b4 100644 (file)
--- 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,23 @@ 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" \
+"  --name-status show names and status 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);
 
@@ -85,6 +86,7 @@ extern int diff_queue_is_empty(void);
 #define DIFF_FORMAT_PATCH      2
 #define DIFF_FORMAT_NO_OUTPUT  3
 #define DIFF_FORMAT_NAME       4
+#define DIFF_FORMAT_NAME_STATUS        5
 
 extern void diff_flush(struct diff_options*);
 
@@ -101,7 +103,7 @@ extern void diff_flush(struct diff_options*);
 /* these are not diff-raw status letters proper, but used by
  * diffcore-filter insn to specify additional restrictions.
  */
-#define DIFF_STATUS_FILTER_AON         'A'
+#define DIFF_STATUS_FILTER_AON         '*'
 #define DIFF_STATUS_FILTER_BROKEN      'B'
 
 #endif /* DIFF_H */