diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-22 12:36:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-22 12:36:28 -0700 |
| commit | 634e0084fac75cf85449a813da14968c9663a094 (patch) | |
| tree | 4954184348dd7032043726df7a2e622e97b52d46 /diff.h | |
| parent | Merge branch 'os/fetch-submodule-optim' (diff) | |
| parent | format-patch: use 'origin' as start of current-series-range when known (diff) | |
| download | git-634e0084fac75cf85449a813da14968c9663a094.tar.gz git-634e0084fac75cf85449a813da14968c9663a094.zip | |
Merge branch 'es/format-patch-interdiff-cleanup'
"format-patch --range-diff=<prev> <origin>..HEAD" has been taught
not to ignore <origin> when <prev> is a single version.
* es/format-patch-interdiff-cleanup:
format-patch: use 'origin' as start of current-series-range when known
diff-lib: tighten show_interdiff()'s interface
diff: move show_interdiff() from its own file to diff-lib
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -601,6 +601,13 @@ int index_differs_from(struct repository *r, const char *def, int ita_invisible_in_index); /* + * Emit an interdiff of two object ID's to 'diff_options.file' optionally + * indented by 'indent' spaces. + */ +void show_interdiff(const struct object_id *, const struct object_id *, + int indent, struct diff_options *); + +/* * Fill the contents of the filespec "df", respecting any textconv defined by * its userdiff driver. The "driver" parameter must come from a * previous call to get_textconv(), and therefore should either be NULL or have |