Fix name of the submodule entry.

Was `rack` in 1st edition but now it's `DbConnector`.
Clean full prompt
Clean doubled `f` option
Rewrap long command line

Closes #165
Fix broken xref
Fix 'dummy ours merge strategy' display

Display the text as text and the command as console source.
Fix two grammatical errors

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Expand undefined alias

"lga" is not defined anywhere in the text; all other examples use explicit "git log ..."

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
add layout for epub metadata
Always use `repo` as reference to JGit repo

Was simplified to `r`
Update diagram to fix #136
fix typo

Signed-off-by: Aleh Suprunovich <br@ahlamon.org>
Fix markup for index item "http-backend"
Fix hex/dec error

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Adjusted filename in git merge output

The previous operations on iss53 were clearly on index.html, so the
merge output should reflect that too for consistency. :)
Change merge commit to C6
Fix typo in URL of the smart git-receive-pack

Reference: https://git.kernel.org/cgit/git/git.git/tree/Documentation/technical/http-protocol.txt#n292
Update rebasing.asc

Tiny typo

Git calculate a checksum -> Git calculates a checksum
Merge pull request #58 from madhead/upstream_updates

Upstream updates