]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'es/format-patch-interdiff-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Sep 2020 19:36:28 +0000 (12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Sep 2020 19:36:28 +0000 (12:36 -0700)
"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

1  2 
Makefile
builtin/log.c
diff-lib.c
log-tree.c

diff --cc Makefile
Simple merge
diff --cc builtin/log.c
Simple merge
diff --cc diff-lib.c
Simple merge
diff --cc log-tree.c
Simple merge