diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-22 22:36:28 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-22 22:36:28 +0300 |
| commit | 634e0084fac75cf85449a813da14968c9663a094 (patch) | |
| tree | 4954184348dd7032043726df7a2e622e97b52d46 /Makefile | |
| parent | bcb68bff80eab46f9d5f367555da803e61d3d7c8 (diff) | |
| parent | 07a7f8debfa43bd28537f475925776a92c30a678 (diff) | |
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 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -889,7 +889,6 @@ LIB_OBJS += hashmap.o LIB_OBJS += help.o LIB_OBJS += hex.o LIB_OBJS += ident.o -LIB_OBJS += interdiff.o LIB_OBJS += json-writer.o LIB_OBJS += kwset.o LIB_OBJS += levenshtein.o |