summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-12-27 14:58:13 -0800
committerJunio C Hamano <gitster@pobox.com>2013-12-27 14:58:13 -0800
commit6904f9aa5ba7666cdb5390733225e123fe25526b (patch)
tree7867aa393189903c8075c16abc35163f6de07243 /diff.h
parent604ada435b78a473baa6962a90def78ccb186c58 (diff)
parent0ea7d5b6f8e258fdec067edf1b136ed87c5670e5 (diff)
downloadgit-6904f9aa5ba7666cdb5390733225e123fe25526b.tar.gz
Merge branch 'zk/difftool-counts'
Show the total number of paths and the number of paths shown so far when "git difftool" prompts to launch an external diff tool, which would give users some sense of progress. * zk/difftool-counts: diff.c: fix some recent whitespace style violations difftool: display the number of files in the diff queue in the prompt
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 1c05b3a6be..760388fa17 100644
--- a/diff.h
+++ b/diff.h
@@ -164,6 +164,8 @@ struct diff_options {
diff_prefix_fn_t output_prefix;
int output_prefix_length;
void *output_prefix_data;
+
+ int diff_path_counter;
};
enum color_diff {