| commit | f5ec1cf60d1ead41212f90055eb45b86784d2ec8 | [log] [tgz] |
|---|---|---|
| author | Jakub Kicinski <kuba@kernel.org> | Mon Feb 08 18:42:11 2021 -0800 |
| committer | Daniel Borkmann <daniel@iogearbox.net> | Wed Feb 24 17:55:24 2021 +0100 |
| tree | b5b2dd7e27bb0267bd2b360473538c14bb029c61 | |
| parent | 23987aa7b04b227d45191284cdad1cd9f4428c33 [diff] |
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>