From 99bfc6691d79eaffaaf170a8b6584bcfe97863dc Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sun, 20 Feb 2011 04:53:21 -0500 Subject: 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 --- merge-recursive.h | 1 + 1 file changed, 1 insertion(+) (limited to 'merge-recursive.h') diff --git a/merge-recursive.h b/merge-recursive.h index f0e056652f..59d1475be9 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; -- cgit v1.2.3