diff options
author | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2019-10-30 10:00:50 -0400 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2019-11-07 13:17:25 -0700 |
commit | e8686a40a32aee572b87552b0835922a1e47bd87 (patch) | |
tree | 518b91e3abbea7e9d34b67ff33b2eb5c8ae63533 /scripts | |
parent | 36bc683dde0af61c6e677e5832ad4380771380d3 (diff) | |
download | linux-e8686a40a32aee572b87552b0835922a1e47bd87.tar.gz linux-e8686a40a32aee572b87552b0835922a1e47bd87.tar.bz2 linux-e8686a40a32aee572b87552b0835922a1e47bd87.zip |
docs: process: Add base-commit trailer usage
One of the recurring complaints from both maintainers and CI system
operators is that performing git-am on received patches is difficult
without knowing the parent object in the git history on which the
patches are based. Without this information, there is a high likelihood
that git-am will fail due to conflicts, which is particularly
frustrating to CI operators.
Git versions starting with v2.9.0 are able to automatically include
base-commit information using the --base flag of git-format-patch.
Document this usage in process/submitting-patches, and add the rationale
for its inclusion, plus instructions for those not using git on where
the "base-commit:" trailer should go.
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions