diff options
author | Denton Liu <liu.denton@gmail.com> | 2020-09-20 11:22:23 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-09-21 04:30:26 (GMT) |
commit | 177a8302683da62a62b5b03e8192fcfa897db750 (patch) | |
tree | 3dacb7efb0aa78978ac2d00209ea7d91a86b7440 /diff.h | |
parent | 4c3fe82ef17a6636c742b95cd292b83b02876e08 (diff) | |
download | git-177a8302683da62a62b5b03e8192fcfa897db750.zip git-177a8302683da62a62b5b03e8192fcfa897db750.tar.gz git-177a8302683da62a62b5b03e8192fcfa897db750.tar.bz2 |
diff-lib: define diff_get_merge_base()
In a future commit, we will be using this function to implement
--merge-base functionality in various diff commands.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r-- | diff.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -580,6 +580,8 @@ void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc); */ const char *diff_aligned_abbrev(const struct object_id *sha1, int); +void diff_get_merge_base(const struct rev_info *revs, struct object_id *mb); + /* do not report anything on removed paths */ #define DIFF_SILENT_ON_REMOVED 01 /* report racily-clean paths as modified */ |