Upstream changes

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -8,26 +8,23 @@ body:
       description: Please search to see if an issue already exists for the bug you encountered.
       options:
         - label: I have searched the existing issues
-    validations:
-      required: true
+          required: true
 
   - type: checkboxes
     attributes:
       label: This report is about a single actionable bug.
       description: Please create one issue per bug, split up your bug reports if needed.
       options:
         - label: I'm reporting a single actionable bug
-    validations:
-      required: true
+          required: true
 
   - type: checkboxes
     attributes:
       label: This report is about the ProGit book, version 2, English language.
       description: Bug reports about translations or the first version of the book are not accepted.
       options:
         - label: This bug is not about a translation or old version
-    validations:
-      required: true
+          required: true
 
   - type: checkboxes
     attributes:

.github/workflows/pr-build.yml

@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

.github/workflows/release-on-merge.yml

@@ -8,7 +8,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 

C-git-commands.asc

@@ -66,7 +66,7 @@ Git има начини за изпълнение по подразбиране
 |Textmate |`git config --global core.editor "mate -w"`
 |Textpad (Windows 64-bit) |`git config --global core.editor "'C:/Program Files/TextPad 5/TextPad.exe' -m` (вижте забележката отдолу)
 |UltraEdit (Windows 64-bit) | `git config --global core.editor Uedit32`
-|Vim |`git config --global core.editor "vim"`
+|Vim |`git config --global core.editor "vim --nofork"`
 |Visual Studio Code |`git config --global core.editor "code --wait"`
 |VSCodium (Free/Libre Open Source Software Binaries of VSCode) | `git config --global core.editor "codium --wait"`
 |WordPad |`git config --global core.editor '"C:\Program Files\Windows NT\Accessories\wordpad.exe"'"`

Gemfile

@@ -3,15 +3,15 @@ source 'https://rubygems.org'
 gem 'rake', '13.0.6'
 gem 'asciidoctor', '2.0.16'
 
-gem 'json', '2.5.1'
+gem 'json', '2.6.1'
 gem 'awesome_print', '1.9.2'
 
 gem 'asciidoctor-epub3', '1.5.1'
-gem 'asciidoctor-pdf', '1.6.0'
+gem 'asciidoctor-pdf', '1.6.1'
 
 gem 'coderay', '1.1.3'
 gem 'pygments.rb', '2.2.0'
 gem 'thread_safe', '0.3.6'
 gem 'epubcheck-ruby', '4.2.6.0'
-gem 'html-proofer', '3.19.2'
+gem 'html-proofer', '3.19.3'
 gem 'kindlegen', '3.1.1'

SECURITY.md

@@ -0,0 +1,5 @@
+## Reporting a security issue
+
+If you find any security issue or vulnerability, please email [[email protected]](mailto:[email protected]) with your report.
+
+Do not open a issue on the `progit/progit2` repository or discuss the vulnerability in public.

book/07-git-tools/sections/credentials.asc

@@ -19,9 +19,8 @@
   Недостатъкът е, че паролите ви се съхраняват в чист текст в домашната директория.
 * Ако използвате Mac, Git предлага "`osxkeychain`" режим, при който данните за достъп се съхраняват в защитена keychain прикрепена към системния ви акаунт.
   Този метод пази данните на диска, те остават валидни, но са криптирани със същата система, която съхранява HTTPS сертификати и auto-fill данните на браузъра Safari.
-* Под Windows, можете да инсталирате helper наречен "`Git Credential Manager for Windows.`"
-  Това е подобно на "`osxkeychain`", но използва Windows Credential Store за контрол на поверителната информация.
-  Може да се намери на https://github.com/Microsoft/Git-Credential-Manager-for-Windows[].
+* Ако използвате Windows, macOS или Linux, можете да инсталирате помощния инструмент https://github.com/GitCredentialManager/git-credential-manager["`Git Credential Manager`"].
+  Той използва нативни за операционната система data stores за да контролира сензитивна информация.
 
 Избирате един от тези методи чрез конфигурацията на Git:
 

book/10-git-internals/sections/maintenance.asc

@@ -67,7 +67,7 @@ cac0cab538b970a37ea1e769cbbde608743bc96d refs/tags/v1.0
 [source,console]
 ----
 $ git log --pretty=oneline
-ab1afef80fac8e34258ff41fc1b867c702daa24b Modify repo a bit
+ab1afef80fac8e34258ff41fc1b867c702daa24b Modify repo.rb a bit
 484a59275031909e19aadb7c92262719cfcdf19a Create repo.rb
 1a410efbd13591db07496601ebc7a059dd55cfe9 Third commit
 cac0cab538b970a37ea1e769cbbde608743bc96d Second commit

book/A-git-in-other-environments/sections/zsh.asc

@@ -28,8 +28,8 @@ autoload -Uz vcs_info
 precmd_vcs_info() { vcs_info }
 precmd_functions+=( precmd_vcs_info )
 setopt prompt_subst
-RPROMPT=\$vcs_info_msg_0_
-# PROMPT=\$vcs_info_msg_0_'%# '
+RPROMPT='${vcs_info_msg_0_}'
+# PROMPT='${vcs_info_msg_0_}%# '
 zstyle ':vcs_info:git:*' formats '%b'
 ----