path: root/merge-recursive.h
diff options
authorJeff King <>2011-02-20 09:53:21 (GMT)
committerJunio C Hamano <>2011-02-21 18:24:08 (GMT)
commit99bfc6691d79eaffaaf170a8b6584bcfe97863dc (patch)
tree73ccfdfe22ca3affd0b7b9ab70e0c1697be1716b /merge-recursive.h
parent3ac942d42ebb1fb48e70d3e5a714d06396e3e2c6 (diff)
merge: enable progress reporting for rename detection
The user can enable or disable it explicitly with the new --progress, but it defaults to checking isatty(2). This works only with merge-recursive and subtree. In theory we could pass a progress flag to other strategies, but none of them support progress at this point, so let's wait until they grow such a feature before worrying about propagating it. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'merge-recursive.h')
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-recursive.h b/merge-recursive.h
index f0e0566..59d1475 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -21,6 +21,7 @@ struct merge_options {
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;