summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorAdam Joseph <adam@westernsemico.com>2022-04-20 03:22:17 -0700
committerAdam Joseph <adam@westernsemico.com>2022-04-20 03:22:17 -0700
commit50217b01dd68cb4dfc24ecfa568b7f1b69a092cc (patch)
treef9f3b686f74a983d05fd32c8c7c29c5a0fd62230 /doc
parent94c0e08808ce3529e4ace6584626d94ca07f21ee (diff)
downloadnixpkgs-50217b01dd68cb4dfc24ecfa568b7f1b69a092cc.tar
nixpkgs-50217b01dd68cb4dfc24ecfa568b7f1b69a092cc.tar.gz
nixpkgs-50217b01dd68cb4dfc24ecfa568b7f1b69a092cc.tar.bz2
nixpkgs-50217b01dd68cb4dfc24ecfa568b7f1b69a092cc.tar.lz
nixpkgs-50217b01dd68cb4dfc24ecfa568b7f1b69a092cc.tar.xz
nixpkgs-50217b01dd68cb4dfc24ecfa568b7f1b69a092cc.tar.zst
nixpkgs-50217b01dd68cb4dfc24ecfa568b7f1b69a092cc.zip
submitting-changes.chapter.md: avoid being specific
There is some doubt as to exactly how to enumerate all the merges from
one branch to another reliably.  In the meantime, let's be a little
more vague.
Diffstat (limited to 'doc')
-rw-r--r--doc/contributing/submitting-changes.chapter.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md
index 043acaedefa..576b0f7d96f 100644
--- a/doc/contributing/submitting-changes.chapter.md
+++ b/doc/contributing/submitting-changes.chapter.md
@@ -227,7 +227,7 @@ digraph {
 }
 ```
 
-[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours; these are the blue arrows in the diagram above.  The purple arrows in the diagram above are done manually and much less frequently.  You can get an idea of how often these merges occur by looking at the `git-log` for `master` and searching for `from NixOS/staging-next` (for the upper purple arrow) or `staging-next into staging` (for the lower arrow).
+[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours; these are the blue arrows in the diagram above.  The purple arrows in the diagram above are done manually and much less frequently.  You can get an idea of how often these merges occur by looking at the git history.
 
 
 ### Master branch {#submitting-changes-master-branch}