aboutsummaryrefslogtreecommitdiffstats
path: root/revision.h
diff options
context:
space:
mode:
authorSergey Organov <sorganov@gmail.com>2020-12-21 18:19:33 +0300
committerJunio C Hamano <gitster@pobox.com>2020-12-21 13:47:30 -0800
commita37eec6333db6f38edd21e74812d6c5f215b6e6c (patch)
tree6089be4d5a751e62fdbeb9642f3e67f721d622f1 /revision.h
parent3d4fd9436337d1688e7e2c2b2da4f7b7e3e8591e (diff)
downloadgit-a37eec6333db6f38edd21e74812d6c5f215b6e6c.tar.gz
revision: move diff merges functions to its own diff-merges.c
Create separate diff-merges.c and diff-merges.h files, and move all the code related to handling of diff merges there. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.h')
-rw-r--r--revision.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/revision.h b/revision.h
index 3dd0229f4e..f6bf860d19 100644
--- a/revision.h
+++ b/revision.h
@@ -456,7 +456,4 @@ int rewrite_parents(struct rev_info *revs,
*/
struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit);
-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);
-
#endif