diff options
author | Jakub Kicinski <kuba@kernel.org> | 2021-02-08 18:42:11 -0800 |
---|---|---|
committer | Daniel Borkmann <daniel@iogearbox.net> | 2021-02-24 17:55:24 +0100 |
commit | f5ec1cf60d1ead41212f90055eb45b86784d2ec8 (patch) | |
tree | b5b2dd7e27bb0267bd2b360473538c14bb029c61 | |
parent | 23987aa7b04b227d45191284cdad1cd9f4428c33 (diff) | |
download | pw-f5ec1cf60d1ead41212f90055eb45b86784d2ec8.tar.gz |
pw-pull: use three-way merge for git-am
When test-applying a series to see if the contents of the patches
on the mailing list match the PR we can allow -3, this avoids
series application failing while the PR pulls cleanly.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-rwxr-xr-x | pw-pull | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -92,7 +92,7 @@ fi if [ ! -z "$series" ]; then mbox_from_series $series git checkout -b $series_branch - git am mbox.i + git am -3 mbox.i rm -f mbox.i git checkout master fi |