merge(3p/git): Merge git upstream at v2.26.2

This commit is contained in:
Vincent Ambo 2020-05-22 17:46:45 +01:00
commit 5229c9b232
1006 changed files with 149006 additions and 60819 deletions

View file

@ -2,16 +2,18 @@
#define RANGE_DIFF_H
#include "diff.h"
#include "argv-array.h"
#define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60
/*
* Compare series of commmits in RANGE1 and RANGE2, and emit to the
* Compare series of commits in RANGE1 and RANGE2, and emit to the
* standard output. NULL can be passed to DIFFOPT to use the built-in
* default.
*/
int show_range_diff(const char *range1, const char *range2,
int creation_factor, int dual_color,
struct diff_options *diffopt);
const struct diff_options *diffopt,
const struct argv_array *other_arg);
#endif