pw-apply: Unify the merge paths
Auto-merge only works with -s today, while BPF folks seem
to favor -c. Unify the two paths. Since both -c and -s
auto-detect merges make merges the default and let user
prevent merges instead. Or force a manual merge.
Both of those options will likely never be used anyway :)
Note that use of auto-merge changes the format of merge
commits slightly. A Link is added at the end, but more
notably we use a real branch name, e.g.:
Merge branch 'net-give-napi_threaded_poll-some-love'
instead of the constructed message:
Merge branch 'net: give napi_threaded_poll() some love'
the subject now lands as the first line of the body:
Merge branch 'net-give-napi_threaded_poll-some-love'
Eric Dumazet says:
====================
net: give napi_threaded_poll() some love
There is interest to revert commit 4cd13c21b207...
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
1 file changed
