Merge branch 'master' into patch-3

Author: katrinleinweber

C-git-commands.asc

@@ -54,20 +54,21 @@ Accompanying the configuration instructions in <<ch01-getting-started#_editor>>,
 |BBEdit (Mac, with command line tools) |`git config --global core.editor "bbedit -w"`
 |Emacs |`git config --global core.editor emacs`
 |Gedit (Linux) |`git config --global core.editor "gedit --wait --new-window"`
-|Gvim (Windows 64-bit) |`git config --global core.editor "'C:/Program Files/Vim/vim72/gvim.exe' --nofork '%*'"` (Also see note below)
+|Gvim (Windows 64-bit) |`git config --global core.editor "'C:\Program Files\Vim\vim72\gvim.exe' --nofork '%*'"` (Also see note below)
 |Kate (Linux) |`git config --global core.editor "kate"`
 |nano |`git config --global core.editor "nano -w"`
 |Notepad (Windows 64-bit) |`git config core.editor notepad`
-|Notepad++ (Windows 64-bit) |`git config --global core.editor "'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin"` (Also see note below)
+|Notepad++ (Windows 64-bit) |`git config --global core.editor "'C:\Program Files\Notepad++\notepad++.exe' -multiInst -notabbar -nosession -noPlugin"` (Also see note below)
 |Scratch (Linux)|`git config --global core.editor "scratch-text-editor"`
 |Sublime Text (macOS) |`git config --global core.editor "/Applications/Sublime\ Text.app/Contents/SharedSupport/bin/subl --new-window --wait"`
-|Sublime Text (Windows 64-bit) |`git config --global core.editor "'C:/Program Files/Sublime Text 3/sublime_text.exe' -w"` (Also see note below)
+|Sublime Text (Windows 64-bit) |`git config --global core.editor "'C:\Program Files\Sublime Text 3\sublime_text.exe' -w"` (Also see note below)
 |TextEdit (macOS)|`git config --global --add core.editor "open -W -n"`
 |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` (Also see note below)
+|Textpad (Windows 64-bit) |`git config --global core.editor "'C:\Program Files\TextPad 5\TextPad.exe' -m` (Also see note below)
 |UltraEdit (Windows 64-bit) | `git config --global core.editor Uedit32`
 |Vim |`git config --global core.editor "vim"`
-|VS Code |`git config --global core.editor "code --wait"`
+|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"'"`
 |Xi | `git config --global core.editor "xi --wait"`
 |==============================

book/02-git-basics/sections/tagging.asc

@@ -261,8 +261,8 @@ If you want to view the versions of files a tag is pointing to, you can do a `gi
 
 [source,console]
 ----
-$ git checkout 2.0.0
-Note: checking out '2.0.0'.
+$ git checkout v2.0.0
+Note: checking out 'v2.0.0'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this

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

@@ -373,9 +373,11 @@ Submodule DbConnector c3f01dc..c87d55d:
   > better connection routine
 ----
 
-Git will by default try to update *all* of your submodules when you run `git submodule update --remote` so if you have a lot of them, you may want to pass the name of just the submodule you want to try to update.
+Git will by default try to update *all* of your submodules when you run `git submodule update --remote`. 
+If you have a lot of them, you may want to pass the name of just the submodule you want to try to update.
 
 ===== Pulling Upstream Changes from the Project Remote
+
 Let's now step into the shoes of your collaborator, who has their own local clone of the MainProject repository.
 Simply executing `git pull` to get your newly committed changes is not enough:
 
@@ -966,7 +968,8 @@ nothing to commit, working tree clean
 ----
 
 Using the `--recurse-submodules` flag of `git checkout` can also be useful when you work on several branches in the superproject, each having your submodule pointing at different commits.
-Indeed, if you switch between branches that record the submodule at different commits, upon executing `git status` the submodule will appear as ``modified'', and indicate ``new commits''. That is because the submodule state is by default not carried over when switching branches.
+Indeed, if you switch between branches that record the submodule at different commits, upon executing `git status` the submodule will appear as ``modified'', and indicate ``new commits''. 
+That is because the submodule state is by default not carried over when switching branches.
 
 This can be really confusing, so it's a good idea to always `git checkout --recurse-submodules` when your project has submodules.
 (For older Git versions that do not have the  `--recurse-submodules` flag, after the checkout you can use `git submodule update --init --recursive` to put the submodules in the right state.)

book/10-git-internals/sections/transfer-protocols.asc

@@ -153,9 +153,11 @@ $ ssh -x git@server "git-receive-pack 'simplegit-progit.git'"
 The `git-receive-pack` command immediately responds with one line for each reference it currently has – in this case, just the `master` branch and its SHA-1.
 The first line also has a list of the server's capabilities (here, `report-status`, `delete-refs`, and some others, including the client identifier).
 
-Each line starts with a 4-character hex value specifying how long the rest of the line is.
-Your first line starts with 00a5, which is hexadecimal for 165, meaning that 165 bytes remain on that line.
-The next line is 0000, meaning the server is done with its references listing.
+The data is transmitted in chunks.
+Each chunk starts with a 4-character hex value specifying how long the chunk is (including the 4 bytes of the length itself).
+Chunks usually contain a single line of data and a trailing linefeed.
+Your first chunk starts with 00a5, which is hexadecimal for 165, meaning the chunk is 165 bytes long.
+The next chunk is 0000, meaning the server is done with its references listing.
 
 Now that it knows the server's state, your `send-pack` process determines what commits it has that the server doesn't.
 For each reference that this push will update, the `send-pack` process tells the `receive-pack` process that information.
@@ -209,6 +211,8 @@ The client then makes another request, this time a `POST`, with the data that `s
 The `POST` request includes the `send-pack` output and the packfile as its payload.
 The server then indicates success or failure with its HTTP response.
 
+Keep in mind the HTTP protocol may further wrap this data inside a chunked transfer encoding.
+
 ===== Downloading Data
 
 (((git commands, fetch-pack)))(((git commands, upload-pack)))

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

@@ -15,7 +15,7 @@ The main features are:
 ** Push/pull/sync with a remote branch.
 ** Resolve merge conflicts.
 ** View diffs.
-* With a extension, you can also handle GitHub Pull Requests:
+* With an extension, you can also handle GitHub Pull Requests:
   https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github[]
 
 The official documentation can be found here: https://code.visualstudio.com/Docs/editor/versioncontrol[]