summaryrefslogtreecommitdiff
path: root/diff-merges.h
diff options
context:
space:
mode:
authorSergey Organov <sorganov@gmail.com>2020-12-21 15:19:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-12-21 21:47:30 (GMT)
commit18f09473bf8685a1f8db254cff915d4c31e86406 (patch)
tree699884da0486d3cb3b3b4c25388f6059457e8f3f /diff-merges.h
parenta37eec6333db6f38edd21e74812d6c5f215b6e6c (diff)
downloadgit-18f09473bf8685a1f8db254cff915d4c31e86406.zip
git-18f09473bf8685a1f8db254cff915d4c31e86406.tar.gz
git-18f09473bf8685a1f8db254cff915d4c31e86406.tar.bz2
diff-merges: rename all functions to have common prefix
Use the same "diff_merges" prefix for all the diff merges function names. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-merges.h')
-rw-r--r--diff-merges.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/diff-merges.h b/diff-merges.h
index 7e970b2..4ced909 100644
--- a/diff-merges.h
+++ b/diff-merges.h
@@ -9,10 +9,15 @@
struct rev_info;
-void init_diff_merge_revs(struct rev_info *revs);
-int parse_diff_merge_opts(struct rev_info *revs, const char **argv);
-void setup_diff_merges_revs(struct rev_info *revs);
-void rev_diff_merges_default_to_dense_combined(struct rev_info *revs);
-void rev_diff_merges_first_parent_defaults_to_enable(struct rev_info *revs);
+void diff_merges_init_revs(struct rev_info *revs);
+
+int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
+
+void diff_merges_setup_revs(struct rev_info *revs);
+
+void diff_merges_default_to_dense_combined(struct rev_info *revs);
+
+void diff_merges_first_parent_defaults_to_enable(struct rev_info *revs);
+
#endif