diff options
| author | maralorn <malte.brandy@maralorn.de> | 2022-03-25 16:32:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-25 16:32:14 +0100 |
| commit | 0e0bb200ff2028432d56f710213873f7dd3d345b (patch) | |
| tree | b3a8aa3cb564bfd077a3ef22ba4fb647a6b90666 /doc | |
| parent | 974af506015178f75768d486f4372a12e6a92578 (diff) | |
| parent | a6bc988f00aab57694d8db53284617a34a7f8d61 (diff) | |
| download | nixpkgs-0e0bb200ff2028432d56f710213873f7dd3d345b.tar nixpkgs-0e0bb200ff2028432d56f710213873f7dd3d345b.tar.gz nixpkgs-0e0bb200ff2028432d56f710213873f7dd3d345b.tar.bz2 nixpkgs-0e0bb200ff2028432d56f710213873f7dd3d345b.tar.lz nixpkgs-0e0bb200ff2028432d56f710213873f7dd3d345b.tar.xz nixpkgs-0e0bb200ff2028432d56f710213873f7dd3d345b.tar.zst nixpkgs-0e0bb200ff2028432d56f710213873f7dd3d345b.zip | |
Merge pull request #165327 from ncfavier/fetchpatch-relative
fetchpatch: add `preIncludes` and `relative`
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/contributing/coding-conventions.chapter.md | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index cfe8582e514..dac6d828ac0 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -540,10 +540,11 @@ If you do need to do create this sort of patch file, one way to do so is with gi If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch`: +- `relative`: Similar to using `git-diff`'s `--relative` flag, only keep changes inside the specified directory, making paths relative to it. - `stripLen`: Remove the first `stripLen` components of pathnames in the patch. - `extraPrefix`: Prefix pathnames by this string. -- `excludes`: Exclude files matching this pattern. -- `includes`: Include only files matching this pattern. +- `excludes`: Exclude files matching these patterns (applies after the above arguments). +- `includes`: Include only files matching these patterns (applies after the above arguments). - `revert`: Revert the patch. Note that because the checksum is computed after applying these effects, using or modifying these arguments will have no effect unless the `sha256` argument is changed as well. |