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>
This commit is contained in:
committed by
Junio C Hamano
parent
4c3fe82ef1
commit
177a830268
2
diff.h
2
diff.h
@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user