diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2013-11-21 17:25:37 +0200 |
---|---|---|
committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-11-14 14:47:19 +0200 |
commit | 4902cb5892a50c64663bd47dd04e15d93c5f5e0a (patch) | |
tree | 4d9d9df1ebcbca91158adb264c310b2a677adbbb /debian/changelog | |
parent | 6d6fccd014dc923ae1b08157fc29a045a2d98773 (diff) | |
download | git-buildpackage-4902cb5892a50c64663bd47dd04e15d93c5f5e0a.tar.gz git-buildpackage-4902cb5892a50c64663bd47dd04e15d93c5f5e0a.tar.bz2 git-buildpackage-4902cb5892a50c64663bd47dd04e15d93c5f5e0a.zip |
pq-rpm: create diff up to the last merge commit
Before, merge commits broke patch generation, or, (most probably) caused
the generated patches to be unapplicable (similar to how
git-format-patch behaves).
Now, changes up to the last merge commit are squashed into one diff if
merge commits are found in the revision list from which patches are to
be generated. Individual patches (one per commit) are generated from the
last merge commit up to the exported revision.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'debian/changelog')
0 files changed, 0 insertions, 0 deletions