]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'sb/format-patch-base-patch-id-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Jun 2019 20:18:46 +0000 (13:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Jun 2019 20:18:46 +0000 (13:18 -0700)
commit8202d12fca5d482640a51c663d4d556c46dbc6b8
treef5440c439b27b06e00f5d0a5229e42bf7131c20e
parentcf3269fba816d9b216b8b0d6e95ca6a345158de5
parenta8f6855f48fd474719e92eecc66c29a28fdc0f46
Merge branch 'sb/format-patch-base-patch-id-fix'

The "--base" option of "format-patch" computed the patch-ids for
prerequisite patches in an unstable way, which has been updated to
compute in a way that is compatible with "git patch-id --stable".

* sb/format-patch-base-patch-id-fix:
  format-patch: make --base patch-id output stable
  format-patch: inform user that patch-id generation is unstable
diff.c
diff.h