Fix merging implicit multiline strings that have inline comments (#3956)

[etc/vim.git] / docs / integrations / source_version_control.md

diff --git a/docs/integrations/source_version_control.md b/docs/integrations/source_version_control.md
index 8b8fd658e0e47776d53936854f4919a63a389c71..16354f849ba90eacc29b2028b8e1aaa4f7f95733 100644 (file)
--- a/docs/integrations/source_version_control.md
+++ b/docs/integrations/source_version_control.md
@@ -6,8 +6,9 @@ Use [pre-commit](https://pre-commit.com/). Once you
 
 ```yaml
 repos:
 
 ```yaml
 repos:

-  - repo: https://github.com/psf/black
-    rev: 23.3.0
+  # Using this mirror lets us use mypyc-compiled black, which is about 2x faster
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 23.10.0

     hooks:
       - id: black
         # It is recommended to specify the latest version of Python
     hooks:
       - id: black
         # It is recommended to specify the latest version of Python


@@ -17,8 +18,10 @@ repos:
         language_version: python3.11
 ```
 
         language_version: python3.11
 ```
 

-Feel free to switch out the `rev` value to something else, like another
-[tag/version][black-tags] or even a specific commit. Although we discourage the use of
+Feel free to switch out the `rev` value to a different version of Black.
+
+Note if you'd like to use a specific commit in `rev`, you'll need to swap the repo
+specified from the mirror to https://github.com/psf/black. We discourage the use of

 branches or other mutable refs since the hook [won't auto update as you may
 expect][pre-commit-mutable-rev].
 
 branches or other mutable refs since the hook [won't auto update as you may
 expect][pre-commit-mutable-rev].
 


@@ -30,8 +33,9 @@ include Jupyter Notebooks. To use this hook, simply replace the hook's `id: blac
 
 ```yaml
 repos:
 
 ```yaml
 repos:

-  - repo: https://github.com/psf/black
-    rev: 23.3.0
+  # Using this mirror lets us use mypyc-compiled black, which is about 2x faster
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 23.10.0

     hooks:
       - id: black-jupyter
         # It is recommended to specify the latest version of Python
     hooks:
       - id: black-jupyter
         # It is recommended to specify the latest version of Python


@@ -45,6 +49,5 @@ repos:
 The `black-jupyter` hook became available in version 21.8b0.
 ```
 
 The `black-jupyter` hook became available in version 21.8b0.
 ```
 

-[black-tags]: https://github.com/psf/black/tags

 [pre-commit-mutable-rev]:
   https://pre-commit.com/#using-the-latest-version-for-a-repository
 [pre-commit-mutable-rev]:
   https://pre-commit.com/#using-the-latest-version-for-a-repository