diff --git a/book/01-introduction/images/areas.png b/book/01-introduction/images/areas.png index 209bc197..da98fb03 100644 Binary files a/book/01-introduction/images/areas.png and b/book/01-introduction/images/areas.png differ diff --git a/book/01-introduction/images/centralized.png b/book/01-introduction/images/centralized.png index e8d103ab..9aa3e902 100644 Binary files a/book/01-introduction/images/centralized.png and b/book/01-introduction/images/centralized.png differ diff --git a/book/01-introduction/images/deltas.png b/book/01-introduction/images/deltas.png index b914131e..47904edb 100644 Binary files a/book/01-introduction/images/deltas.png and b/book/01-introduction/images/deltas.png differ diff --git a/book/01-introduction/images/distributed.png b/book/01-introduction/images/distributed.png index 572552cd..53cfcaeb 100644 Binary files a/book/01-introduction/images/distributed.png and b/book/01-introduction/images/distributed.png differ diff --git a/book/01-introduction/images/git-osx-installer.png b/book/01-introduction/images/git-osx-installer.png index 7490d693..8224b4a1 100644 Binary files a/book/01-introduction/images/git-osx-installer.png and b/book/01-introduction/images/git-osx-installer.png differ diff --git a/book/01-introduction/images/local.png b/book/01-introduction/images/local.png index abb473d0..1779acfb 100644 Binary files a/book/01-introduction/images/local.png and b/book/01-introduction/images/local.png differ diff --git a/book/01-introduction/images/snapshots.png b/book/01-introduction/images/snapshots.png index 82eb324f..1036a424 100644 Binary files a/book/01-introduction/images/snapshots.png and b/book/01-introduction/images/snapshots.png differ diff --git a/book/01-introduction/sections/first-time-setup.asc b/book/01-introduction/sections/first-time-setup.asc index 7f331bb2..c9d7561f 100644 --- a/book/01-introduction/sections/first-time-setup.asc +++ b/book/01-introduction/sections/first-time-setup.asc @@ -18,7 +18,9 @@ Each level overrides values in the previous level, so values in `.git/config` tr On Windows systems, Git looks for the `.gitconfig` file in the `$HOME` directory (`C:\Users\$USER` for most people). It also still looks for `/etc/gitconfig`, although it's relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer. -However, if you are using Git for Windows 2.x, it is `C:\Documents and Settings\All Users\Application Data\Git\config` on Windows XP, and it is `C:\ProgramData\Git\config` on Windows Vista and newer. +If you are using Git for Windows 2.x or later, there is also a system-level config file at +`C:\Documents and Settings\All Users\Application Data\Git\config` on Windows XP, and in `C:\ProgramData\Git\config` on Windows Vista and newer. +This config file can only be changed by `git config -f ` as an admin. ==== Your Identity @@ -39,7 +41,8 @@ Many of the GUI tools will help you do this when you first run them. ==== Your Editor Now that your identity is set up, you can configure the default text editor that will be used when Git needs you to type in a message. -If not configured, Git uses your system's default editor, which is generally Vim. +If not configured, Git uses your system's default editor, which is system dependant. + If you want to use a different text editor, such as Emacs, you can do the following: [source,console] @@ -47,11 +50,29 @@ If you want to use a different text editor, such as Emacs, you can do the follow $ git config --global core.editor emacs ---- +While on a Windows system, if you want to use a different text editor, such as Notepad++, you can do the following: + +On a x86 system +[source,console] +---- +$ git config --global core.editor "'C:/Program Files/Notepad++/notepad++.exe' -multiInst -nosession" +---- +On a x64 system +[source,console] +---- +$ git config --global core.editor "'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -nosession" +---- + +[NOTE] +==== +Vim, Emacs and Notepad++ are popular text editors often used by developers on Unix based systems like Linux and OS X or a Windows system. +If you are not familiar with either of these editors, you may need to search for specific instructions for how to set up your favorite editor with Git. +==== + [WARNING] ==== -Vim and Emacs are popular text editors often used by developers on Unix based systems like Linux and Mac. -If you are not familiar with either of these editors or are on a Windows system, you may need to search for instructions for how to set up your favorite editor with Git. -If you don't set an editor like this and you don't know what Vim or Emacs are, you will likely get into a really confusing state when they are launched. +You may find, if you don't setup an editor like this, you will likely get into a really confusing state when they are launched. +Such example on a Windows system may include a prematurely terminated Git operation during a Git initiated edit. ==== ==== Checking Your Settings diff --git a/book/01-introduction/sections/installing.asc b/book/01-introduction/sections/installing.asc index 661d62d2..be667710 100644 --- a/book/01-introduction/sections/installing.asc +++ b/book/01-introduction/sections/installing.asc @@ -73,19 +73,28 @@ For example, if you're on a system that has yum (such as Fedora) or apt-get (suc [source,console] ---- $ sudo yum install curl-devel expat-devel gettext-devel \ - openssl-devel zlib-devel + openssl-devel perl-devel zlib-devel $ sudo apt-get install libcurl4-gnutls-dev libexpat1-dev gettext \ libz-dev libssl-dev ---- -In order to be able to add the documentation in various formats (doc, html, info), these additional dependencies are required: +In order to be able to add the documentation in various formats (doc, html, info), these additional dependencies are required (Note: users of RHEL and RHEL-derivatives like CentOS and Scientific Linux will have to https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F[enable the EPEL repository] to download the `docbook2X` package): [source,console] ---- -$ sudo yum install asciidoc xmlto docbook2x +$ sudo yum install asciidoc xmlto docbook2X $ sudo apt-get install asciidoc xmlto docbook2x ---- +Additionally, if you're using Fedora/RHEL/RHEL-derivatives, you need to do this + +[source,console] +---- +$ sudo ln -s /usr/bin/db2x_docbook2texi /usr/bin/docbook2x-texi +---- + +due to binary name differences. + When you have all the necessary dependencies, you can go ahead and grab the latest tagged release tarball from several places. You can get it via the Kernel.org site, at https://www.kernel.org/pub/software/scm/git[], or the mirror on the GitHub web site, at https://github.com/git/git/releases[]. It's generally a little clearer what the latest version is on the GitHub page, but the kernel.org page also has release signatures if you want to verify your download. diff --git a/book/02-git-basics/images/lifecycle.png b/book/02-git-basics/images/lifecycle.png index 1ef9e684..922b02c0 100644 Binary files a/book/02-git-basics/images/lifecycle.png and b/book/02-git-basics/images/lifecycle.png differ diff --git a/book/02-git-basics/sections/undoing.asc b/book/02-git-basics/sections/undoing.asc index faa306b5..9a37e479 100644 --- a/book/02-git-basics/sections/undoing.asc +++ b/book/02-git-basics/sections/undoing.asc @@ -128,6 +128,6 @@ Don't ever use this command unless you absolutely know that you don't want the f If you would like to keep the changes you've made to that file but still need to get it out of the way for now, we'll go over stashing and branching in <<_git_branching>>; these are generally better ways to go. -Remember, anything that is __committed__ in Git can almost always be recovered. +Remember, anything that is _committed_ in Git can almost always be recovered. Even commits that were on branches that were deleted or commits that were overwritten with an `--amend` commit can be recovered (see <<_data_recovery>> for data recovery). However, anything you lose that was never committed is likely never to be seen again. diff --git a/book/03-git-branching/images/advance-master.png b/book/03-git-branching/images/advance-master.png index b789feda..c3a7ebe6 100644 Binary files a/book/03-git-branching/images/advance-master.png and b/book/03-git-branching/images/advance-master.png differ diff --git a/book/03-git-branching/images/advance-testing.png b/book/03-git-branching/images/advance-testing.png index 35d05811..312e65e1 100644 Binary files a/book/03-git-branching/images/advance-testing.png and b/book/03-git-branching/images/advance-testing.png differ diff --git a/book/03-git-branching/images/basic-branching-1.png b/book/03-git-branching/images/basic-branching-1.png index b49b9f4c..acc3866f 100644 Binary files a/book/03-git-branching/images/basic-branching-1.png and b/book/03-git-branching/images/basic-branching-1.png differ diff --git a/book/03-git-branching/images/basic-branching-2.png b/book/03-git-branching/images/basic-branching-2.png index 329c9f52..c3f14914 100644 Binary files a/book/03-git-branching/images/basic-branching-2.png and b/book/03-git-branching/images/basic-branching-2.png differ diff --git a/book/03-git-branching/images/basic-branching-3.png b/book/03-git-branching/images/basic-branching-3.png index 688addac..ebc9ca95 100644 Binary files a/book/03-git-branching/images/basic-branching-3.png and b/book/03-git-branching/images/basic-branching-3.png differ diff --git a/book/03-git-branching/images/basic-branching-4.png b/book/03-git-branching/images/basic-branching-4.png index c1f1f477..ab8f2228 100644 Binary files a/book/03-git-branching/images/basic-branching-4.png and b/book/03-git-branching/images/basic-branching-4.png differ diff --git a/book/03-git-branching/images/basic-branching-5.png b/book/03-git-branching/images/basic-branching-5.png index 1d4c0642..947133f7 100644 Binary files a/book/03-git-branching/images/basic-branching-5.png and b/book/03-git-branching/images/basic-branching-5.png differ diff --git a/book/03-git-branching/images/basic-branching-6.png b/book/03-git-branching/images/basic-branching-6.png index b93918b5..6023d694 100644 Binary files a/book/03-git-branching/images/basic-branching-6.png and b/book/03-git-branching/images/basic-branching-6.png differ diff --git a/book/03-git-branching/images/basic-merging-1.png b/book/03-git-branching/images/basic-merging-1.png index 08b923f3..e1bcc27f 100644 Binary files a/book/03-git-branching/images/basic-merging-1.png and b/book/03-git-branching/images/basic-merging-1.png differ diff --git a/book/03-git-branching/images/basic-merging-2.png b/book/03-git-branching/images/basic-merging-2.png index b1c58b23..a2438266 100644 Binary files a/book/03-git-branching/images/basic-merging-2.png and b/book/03-git-branching/images/basic-merging-2.png differ diff --git a/book/03-git-branching/images/basic-rebase-1.png b/book/03-git-branching/images/basic-rebase-1.png index bc804f6a..44ea49e3 100644 Binary files a/book/03-git-branching/images/basic-rebase-1.png and b/book/03-git-branching/images/basic-rebase-1.png differ diff --git a/book/03-git-branching/images/basic-rebase-2.png b/book/03-git-branching/images/basic-rebase-2.png index c75bf386..c82140cd 100644 Binary files a/book/03-git-branching/images/basic-rebase-2.png and b/book/03-git-branching/images/basic-rebase-2.png differ diff --git a/book/03-git-branching/images/basic-rebase-3.png b/book/03-git-branching/images/basic-rebase-3.png index a18e34f9..a1afaef6 100644 Binary files a/book/03-git-branching/images/basic-rebase-3.png and b/book/03-git-branching/images/basic-rebase-3.png differ diff --git a/book/03-git-branching/images/basic-rebase-4.png b/book/03-git-branching/images/basic-rebase-4.png index 277b9257..e97c1685 100644 Binary files a/book/03-git-branching/images/basic-rebase-4.png and b/book/03-git-branching/images/basic-rebase-4.png differ diff --git a/book/03-git-branching/images/branch-and-history.png b/book/03-git-branching/images/branch-and-history.png index ba2734e0..2b4ab17e 100644 Binary files a/book/03-git-branching/images/branch-and-history.png and b/book/03-git-branching/images/branch-and-history.png differ diff --git a/book/03-git-branching/images/checkout-master.png b/book/03-git-branching/images/checkout-master.png index db052e6a..06e98787 100644 Binary files a/book/03-git-branching/images/checkout-master.png and b/book/03-git-branching/images/checkout-master.png differ diff --git a/book/03-git-branching/images/commit-and-tree.png b/book/03-git-branching/images/commit-and-tree.png index 65289ae8..3ddf1cd5 100644 Binary files a/book/03-git-branching/images/commit-and-tree.png and b/book/03-git-branching/images/commit-and-tree.png differ diff --git a/book/03-git-branching/images/commits-and-parents.png b/book/03-git-branching/images/commits-and-parents.png index e0c9bbea..d5639726 100644 Binary files a/book/03-git-branching/images/commits-and-parents.png and b/book/03-git-branching/images/commits-and-parents.png differ diff --git a/book/03-git-branching/images/head-to-master.png b/book/03-git-branching/images/head-to-master.png index 5086d0fb..86c7ae85 100644 Binary files a/book/03-git-branching/images/head-to-master.png and b/book/03-git-branching/images/head-to-master.png differ diff --git a/book/03-git-branching/images/head-to-testing.png b/book/03-git-branching/images/head-to-testing.png index 5422a8ed..08352d60 100644 Binary files a/book/03-git-branching/images/head-to-testing.png and b/book/03-git-branching/images/head-to-testing.png differ diff --git a/book/03-git-branching/images/interesting-rebase-1.png b/book/03-git-branching/images/interesting-rebase-1.png index 410287e6..ed58a06c 100644 Binary files a/book/03-git-branching/images/interesting-rebase-1.png and b/book/03-git-branching/images/interesting-rebase-1.png differ diff --git a/book/03-git-branching/images/interesting-rebase-2.png b/book/03-git-branching/images/interesting-rebase-2.png index ac274080..95c30681 100644 Binary files a/book/03-git-branching/images/interesting-rebase-2.png and b/book/03-git-branching/images/interesting-rebase-2.png differ diff --git a/book/03-git-branching/images/interesting-rebase-3.png b/book/03-git-branching/images/interesting-rebase-3.png index 91f46473..45aeeca2 100644 Binary files a/book/03-git-branching/images/interesting-rebase-3.png and b/book/03-git-branching/images/interesting-rebase-3.png differ diff --git a/book/03-git-branching/images/interesting-rebase-4.png b/book/03-git-branching/images/interesting-rebase-4.png index 89af34f5..44b6ca5f 100644 Binary files a/book/03-git-branching/images/interesting-rebase-4.png and b/book/03-git-branching/images/interesting-rebase-4.png differ diff --git a/book/03-git-branching/images/interesting-rebase-5.png b/book/03-git-branching/images/interesting-rebase-5.png index 0bc02243..aa0745db 100644 Binary files a/book/03-git-branching/images/interesting-rebase-5.png and b/book/03-git-branching/images/interesting-rebase-5.png differ diff --git a/book/03-git-branching/images/lr-branches-1.png b/book/03-git-branching/images/lr-branches-1.png index 3d26562f..ad7c9c9a 100644 Binary files a/book/03-git-branching/images/lr-branches-1.png and b/book/03-git-branching/images/lr-branches-1.png differ diff --git a/book/03-git-branching/images/lr-branches-2.png b/book/03-git-branching/images/lr-branches-2.png index acfb23db..8db4bc08 100644 Binary files a/book/03-git-branching/images/lr-branches-2.png and b/book/03-git-branching/images/lr-branches-2.png differ diff --git a/book/03-git-branching/images/perils-of-rebasing-1.png b/book/03-git-branching/images/perils-of-rebasing-1.png index ce92ce97..013e04bf 100644 Binary files a/book/03-git-branching/images/perils-of-rebasing-1.png and b/book/03-git-branching/images/perils-of-rebasing-1.png differ diff --git a/book/03-git-branching/images/perils-of-rebasing-2.png b/book/03-git-branching/images/perils-of-rebasing-2.png index e9b643fa..2c14ccdf 100644 Binary files a/book/03-git-branching/images/perils-of-rebasing-2.png and b/book/03-git-branching/images/perils-of-rebasing-2.png differ diff --git a/book/03-git-branching/images/perils-of-rebasing-3.png b/book/03-git-branching/images/perils-of-rebasing-3.png index e049cbcd..505407a0 100644 Binary files a/book/03-git-branching/images/perils-of-rebasing-3.png and b/book/03-git-branching/images/perils-of-rebasing-3.png differ diff --git a/book/03-git-branching/images/perils-of-rebasing-4.png b/book/03-git-branching/images/perils-of-rebasing-4.png index 669fc812..01b9dbba 100644 Binary files a/book/03-git-branching/images/perils-of-rebasing-4.png and b/book/03-git-branching/images/perils-of-rebasing-4.png differ diff --git a/book/03-git-branching/images/perils-of-rebasing-5.png b/book/03-git-branching/images/perils-of-rebasing-5.png index 9ba97480..20a18929 100644 Binary files a/book/03-git-branching/images/perils-of-rebasing-5.png and b/book/03-git-branching/images/perils-of-rebasing-5.png differ diff --git a/book/03-git-branching/images/remote-branches-1.png b/book/03-git-branching/images/remote-branches-1.png index 394234f0..759538f4 100644 Binary files a/book/03-git-branching/images/remote-branches-1.png and b/book/03-git-branching/images/remote-branches-1.png differ diff --git a/book/03-git-branching/images/remote-branches-2.png b/book/03-git-branching/images/remote-branches-2.png index cd9e9d27..14cfe56c 100644 Binary files a/book/03-git-branching/images/remote-branches-2.png and b/book/03-git-branching/images/remote-branches-2.png differ diff --git a/book/03-git-branching/images/remote-branches-3.png b/book/03-git-branching/images/remote-branches-3.png index f2a2d163..6d1993e4 100644 Binary files a/book/03-git-branching/images/remote-branches-3.png and b/book/03-git-branching/images/remote-branches-3.png differ diff --git a/book/03-git-branching/images/remote-branches-4.png b/book/03-git-branching/images/remote-branches-4.png index 9047854e..b4183bf1 100644 Binary files a/book/03-git-branching/images/remote-branches-4.png and b/book/03-git-branching/images/remote-branches-4.png differ diff --git a/book/03-git-branching/images/remote-branches-5.png b/book/03-git-branching/images/remote-branches-5.png index 78b10d28..be228239 100644 Binary files a/book/03-git-branching/images/remote-branches-5.png and b/book/03-git-branching/images/remote-branches-5.png differ diff --git a/book/03-git-branching/images/topic-branches-1.png b/book/03-git-branching/images/topic-branches-1.png index 5463092b..3bdca0dc 100644 Binary files a/book/03-git-branching/images/topic-branches-1.png and b/book/03-git-branching/images/topic-branches-1.png differ diff --git a/book/03-git-branching/images/topic-branches-2.png b/book/03-git-branching/images/topic-branches-2.png index 320e4e88..fe139d99 100644 Binary files a/book/03-git-branching/images/topic-branches-2.png and b/book/03-git-branching/images/topic-branches-2.png differ diff --git a/book/03-git-branching/images/two-branches.png b/book/03-git-branching/images/two-branches.png index 01b385c3..aa6377a0 100644 Binary files a/book/03-git-branching/images/two-branches.png and b/book/03-git-branching/images/two-branches.png differ diff --git a/book/03-git-branching/sections/rebasing.asc b/book/03-git-branching/sections/rebasing.asc index e47fd4b3..5fccd38c 100644 --- a/book/03-git-branching/sections/rebasing.asc +++ b/book/03-git-branching/sections/rebasing.asc @@ -137,7 +137,7 @@ image::images/interesting-rebase-5.png[Final commit history.] (((rebasing, perils of))) Ahh, but the bliss of rebasing isn't without its drawbacks, which can be summed up in a single line: -**Do not rebase commits that exist outside your repository.** +*Do not rebase commits that exist outside your repository.* If you follow that guideline, you'll be fine. If you don't, people will hate you, and you'll be scorned by friends and family. diff --git a/book/04-git-server/images/bitnami.png b/book/04-git-server/images/bitnami.png index b7929f48..9852e727 100644 Binary files a/book/04-git-server/images/bitnami.png and b/book/04-git-server/images/bitnami.png differ diff --git a/book/04-git-server/images/git-instaweb.png b/book/04-git-server/images/git-instaweb.png index 6c56b710..c1ba06cf 100644 Binary files a/book/04-git-server/images/git-instaweb.png and b/book/04-git-server/images/git-instaweb.png differ diff --git a/book/04-git-server/images/gitlab-broadcast.png b/book/04-git-server/images/gitlab-broadcast.png index 5658f4e0..8d3f690d 100644 Binary files a/book/04-git-server/images/gitlab-broadcast.png and b/book/04-git-server/images/gitlab-broadcast.png differ diff --git a/book/04-git-server/images/gitlab-groups.png b/book/04-git-server/images/gitlab-groups.png index 486b4441..399c5e62 100644 Binary files a/book/04-git-server/images/gitlab-groups.png and b/book/04-git-server/images/gitlab-groups.png differ diff --git a/book/04-git-server/images/gitlab-menu.png b/book/04-git-server/images/gitlab-menu.png index 902a7f96..beed4497 100644 Binary files a/book/04-git-server/images/gitlab-menu.png and b/book/04-git-server/images/gitlab-menu.png differ diff --git a/book/04-git-server/images/gitlab-users.png b/book/04-git-server/images/gitlab-users.png index 4e2b2090..e2edb586 100644 Binary files a/book/04-git-server/images/gitlab-users.png and b/book/04-git-server/images/gitlab-users.png differ diff --git a/book/04-git-server/sections/smart-http.asc b/book/04-git-server/sections/smart-http.asc index 543c3df3..b0aee5c0 100644 --- a/book/04-git-server/sections/smart-http.asc +++ b/book/04-git-server/sections/smart-http.asc @@ -13,10 +13,17 @@ If you don't have Apache setup, you can do so on a Linux box with something like [source,console] ---- $ sudo apt-get install apache2 apache2-utils -$ a2enmod cgi alias env +$ a2enmod cgi alias env rewrite ---- -This also enables the `mod_cgi`, `mod_alias`, and `mod_env` modules, which are all needed for this to work properly. +This also enables the `mod_cgi`, `mod_alias`, `mod_env`, and `mod_rewrite` modules, which are all needed for this to work properly. + +You’ll also need to set the Unix user group of the `/opt/git` directories to `www-data` so your web server can read- and write-access the repositories, because the Apache instance running the CGI script will (by default) be running as that user: + +[source,console] +---- +$ chgrp -R www-data /opt/git +---- Next we need to add some things to the Apache configuration to run the `git-http-backend` as the handler for anything coming into the `/git` path of your web server. @@ -29,28 +36,24 @@ ScriptAlias /git/ /usr/lib/git-core/git-http-backend/ If you leave out `GIT_HTTP_EXPORT_ALL` environment variable, then Git will only serve to unauthenticated clients the repositories with the `git-daemon-export-ok` file in them, just like the Git daemon did. -Then you'll have to tell Apache to allow requests to that path with something like this: +Finally you'll want to tell Apache to allow requests to `git-http-backend` and make writes be authenticated somehow, possibly with an Auth block like this: [source,console] ---- - - Options ExecCGI Indexes - Order allow,deny - Allow from all - Require all granted - ----- - -Finally you'll want to make writes be authenticated somehow, possibly with an Auth block like this: +RewriteEngine On +RewriteCond %{QUERY_STRING} service=git-receive-pack [OR] +RewriteCond %{REQUEST_URI} /git-receive-pack$ +RewriteRule ^/git/ - [E=AUTHREQUIRED] -[source,console] ----- - + AuthType Basic AuthName "Git Access" AuthUserFile /opt/git/.htpasswd Require valid-user - + Order deny,allow + Deny from env=AUTHREQUIRED + Satisfy any + ---- That will require you to create a `.htpasswd` file containing the passwords of all the valid users. @@ -58,7 +61,7 @@ Here is an example of adding a ``schacon'' user to the file: [source,console] ---- -$ htdigest -c /opt/git/.htpasswd "Git Access" schacon +$ htpasswd -c /opt/git/.htpasswd schacon ---- There are tons of ways to have Apache authenticate users, you'll have to choose and implement one of them. diff --git a/book/05-distributed-git/images/benevolent-dictator.png b/book/05-distributed-git/images/benevolent-dictator.png index a742a2ed..aeb47e7c 100644 Binary files a/book/05-distributed-git/images/benevolent-dictator.png and b/book/05-distributed-git/images/benevolent-dictator.png differ diff --git a/book/05-distributed-git/images/centralized_workflow.png b/book/05-distributed-git/images/centralized_workflow.png index 4f10782f..d5d660f5 100644 Binary files a/book/05-distributed-git/images/centralized_workflow.png and b/book/05-distributed-git/images/centralized_workflow.png differ diff --git a/book/05-distributed-git/images/git-diff-check.png b/book/05-distributed-git/images/git-diff-check.png index 5dc9ae40..20161b20 100644 Binary files a/book/05-distributed-git/images/git-diff-check.png and b/book/05-distributed-git/images/git-diff-check.png differ diff --git a/book/05-distributed-git/images/integration-manager.png b/book/05-distributed-git/images/integration-manager.png index c877f592..fd0d531e 100644 Binary files a/book/05-distributed-git/images/integration-manager.png and b/book/05-distributed-git/images/integration-manager.png differ diff --git a/book/05-distributed-git/images/large-merges-1.png b/book/05-distributed-git/images/large-merges-1.png index b4910f2d..d3ee025a 100644 Binary files a/book/05-distributed-git/images/large-merges-1.png and b/book/05-distributed-git/images/large-merges-1.png differ diff --git a/book/05-distributed-git/images/large-merges-2.png b/book/05-distributed-git/images/large-merges-2.png index 0fa474d1..2d23e691 100644 Binary files a/book/05-distributed-git/images/large-merges-2.png and b/book/05-distributed-git/images/large-merges-2.png differ diff --git a/book/05-distributed-git/images/managed-team-1.png b/book/05-distributed-git/images/managed-team-1.png index 84c6f1fb..489b6322 100644 Binary files a/book/05-distributed-git/images/managed-team-1.png and b/book/05-distributed-git/images/managed-team-1.png differ diff --git a/book/05-distributed-git/images/managed-team-2.png b/book/05-distributed-git/images/managed-team-2.png index 677e095d..25c2db2b 100644 Binary files a/book/05-distributed-git/images/managed-team-2.png and b/book/05-distributed-git/images/managed-team-2.png differ diff --git a/book/05-distributed-git/images/managed-team-3.png b/book/05-distributed-git/images/managed-team-3.png index b2f3e07c..a8a08a70 100644 Binary files a/book/05-distributed-git/images/managed-team-3.png and b/book/05-distributed-git/images/managed-team-3.png differ diff --git a/book/05-distributed-git/images/managed-team-flow.png b/book/05-distributed-git/images/managed-team-flow.png index 9e4d93f5..18be331d 100644 Binary files a/book/05-distributed-git/images/managed-team-flow.png and b/book/05-distributed-git/images/managed-team-flow.png differ diff --git a/book/05-distributed-git/images/merging-workflows-1.png b/book/05-distributed-git/images/merging-workflows-1.png index 54a96fc0..461de6e2 100644 Binary files a/book/05-distributed-git/images/merging-workflows-1.png and b/book/05-distributed-git/images/merging-workflows-1.png differ diff --git a/book/05-distributed-git/images/merging-workflows-2.png b/book/05-distributed-git/images/merging-workflows-2.png index 6417c3de..5a0d1fcf 100644 Binary files a/book/05-distributed-git/images/merging-workflows-2.png and b/book/05-distributed-git/images/merging-workflows-2.png differ diff --git a/book/05-distributed-git/images/merging-workflows-3.png b/book/05-distributed-git/images/merging-workflows-3.png index 1cb18c84..f3a32367 100644 Binary files a/book/05-distributed-git/images/merging-workflows-3.png and b/book/05-distributed-git/images/merging-workflows-3.png differ diff --git a/book/05-distributed-git/images/merging-workflows-4 2.png b/book/05-distributed-git/images/merging-workflows-4 2.png index 88a696a3..32ae908e 100644 Binary files a/book/05-distributed-git/images/merging-workflows-4 2.png and b/book/05-distributed-git/images/merging-workflows-4 2.png differ diff --git a/book/05-distributed-git/images/merging-workflows-4.png b/book/05-distributed-git/images/merging-workflows-4.png index d2f079e6..2ad04c13 100644 Binary files a/book/05-distributed-git/images/merging-workflows-4.png and b/book/05-distributed-git/images/merging-workflows-4.png differ diff --git a/book/05-distributed-git/images/merging-workflows-5.png b/book/05-distributed-git/images/merging-workflows-5.png index 2eb25720..151cbd27 100644 Binary files a/book/05-distributed-git/images/merging-workflows-5.png and b/book/05-distributed-git/images/merging-workflows-5.png differ diff --git a/book/05-distributed-git/images/public-small-1.png b/book/05-distributed-git/images/public-small-1.png index afc27b29..efcb90d6 100644 Binary files a/book/05-distributed-git/images/public-small-1.png and b/book/05-distributed-git/images/public-small-1.png differ diff --git a/book/05-distributed-git/images/public-small-2.png b/book/05-distributed-git/images/public-small-2.png index 8632c0c3..9dd40631 100644 Binary files a/book/05-distributed-git/images/public-small-2.png and b/book/05-distributed-git/images/public-small-2.png differ diff --git a/book/05-distributed-git/images/public-small-3.png b/book/05-distributed-git/images/public-small-3.png index c2c33f14..fa06f77e 100644 Binary files a/book/05-distributed-git/images/public-small-3.png and b/book/05-distributed-git/images/public-small-3.png differ diff --git a/book/05-distributed-git/images/rebasing-1.png b/book/05-distributed-git/images/rebasing-1.png index a66f47cd..cd3efa16 100644 Binary files a/book/05-distributed-git/images/rebasing-1.png and b/book/05-distributed-git/images/rebasing-1.png differ diff --git a/book/05-distributed-git/images/rebasing-2.png b/book/05-distributed-git/images/rebasing-2.png index 7be83863..55ca410b 100644 Binary files a/book/05-distributed-git/images/rebasing-2.png and b/book/05-distributed-git/images/rebasing-2.png differ diff --git a/book/05-distributed-git/images/small-team-1.png b/book/05-distributed-git/images/small-team-1.png index f821bf6a..d13654ec 100644 Binary files a/book/05-distributed-git/images/small-team-1.png and b/book/05-distributed-git/images/small-team-1.png differ diff --git a/book/05-distributed-git/images/small-team-2.png b/book/05-distributed-git/images/small-team-2.png index 33e88eac..1af62787 100644 Binary files a/book/05-distributed-git/images/small-team-2.png and b/book/05-distributed-git/images/small-team-2.png differ diff --git a/book/05-distributed-git/images/small-team-3.png b/book/05-distributed-git/images/small-team-3.png index 9cddbb43..3b01de8b 100644 Binary files a/book/05-distributed-git/images/small-team-3.png and b/book/05-distributed-git/images/small-team-3.png differ diff --git a/book/05-distributed-git/images/small-team-4.png b/book/05-distributed-git/images/small-team-4.png index abaeee34..b5e8c00b 100644 Binary files a/book/05-distributed-git/images/small-team-4.png and b/book/05-distributed-git/images/small-team-4.png differ diff --git a/book/05-distributed-git/images/small-team-5.png b/book/05-distributed-git/images/small-team-5.png index ef3bba19..e0215e4f 100644 Binary files a/book/05-distributed-git/images/small-team-5.png and b/book/05-distributed-git/images/small-team-5.png differ diff --git a/book/05-distributed-git/images/small-team-6.png b/book/05-distributed-git/images/small-team-6.png index 16f429be..35794441 100644 Binary files a/book/05-distributed-git/images/small-team-6.png and b/book/05-distributed-git/images/small-team-6.png differ diff --git a/book/05-distributed-git/images/small-team-7.png b/book/05-distributed-git/images/small-team-7.png index ee6934d8..6bbbc2d8 100644 Binary files a/book/05-distributed-git/images/small-team-7.png and b/book/05-distributed-git/images/small-team-7.png differ diff --git a/book/05-distributed-git/images/small-team-flow.png b/book/05-distributed-git/images/small-team-flow.png index 846e2c30..c8589ba6 100644 Binary files a/book/05-distributed-git/images/small-team-flow.png and b/book/05-distributed-git/images/small-team-flow.png differ diff --git a/book/05-distributed-git/sections/contributing.asc b/book/05-distributed-git/sections/contributing.asc index d8e1f7d2..1c73ce32 100644 --- a/book/05-distributed-git/sections/contributing.asc +++ b/book/05-distributed-git/sections/contributing.asc @@ -108,7 +108,7 @@ The first developer, John, clones the repository, makes a change, and commits lo ---- # John's Machine $ git clone john@githost:simplegit.git -Initialized empty Git repository in /home/john/simplegit/.git/ +Cloning into 'simplegit'... ... $ cd simplegit/ $ vim lib/simplegit.rb @@ -123,7 +123,7 @@ The second developer, Jessica, does the same thing – clones the repository and ---- # Jessica's Machine $ git clone jessica@githost:simplegit.git -Initialized empty Git repository in /home/jessica/simplegit/.git/ +Cloning into 'simplegit'... ... $ cd simplegit/ $ vim TODO diff --git a/book/06-github/callouts/10.png b/book/06-github/callouts/10.png index 80872645..821ef4ce 100644 Binary files a/book/06-github/callouts/10.png and b/book/06-github/callouts/10.png differ diff --git a/book/06-github/callouts/2.png b/book/06-github/callouts/2.png index 4bb6abc0..e881df13 100644 Binary files a/book/06-github/callouts/2.png and b/book/06-github/callouts/2.png differ diff --git a/book/06-github/callouts/3.png b/book/06-github/callouts/3.png index e132a559..200d5825 100644 Binary files a/book/06-github/callouts/3.png and b/book/06-github/callouts/3.png differ diff --git a/book/06-github/callouts/5.png b/book/06-github/callouts/5.png index 76375432..e52d3a84 100644 Binary files a/book/06-github/callouts/5.png and b/book/06-github/callouts/5.png differ diff --git a/book/06-github/callouts/7.png b/book/06-github/callouts/7.png index 009bf1a1..f07d991f 100644 Binary files a/book/06-github/callouts/7.png and b/book/06-github/callouts/7.png differ diff --git a/book/06-github/callouts/8.png b/book/06-github/callouts/8.png index 2470994e..c99ae9e7 100644 Binary files a/book/06-github/callouts/8.png and b/book/06-github/callouts/8.png differ diff --git a/book/06-github/images/2fa-1.png b/book/06-github/images/2fa-1.png index 20a6e599..5abd7437 100644 Binary files a/book/06-github/images/2fa-1.png and b/book/06-github/images/2fa-1.png differ diff --git a/book/06-github/images/account-settings.png b/book/06-github/images/account-settings.png index 622171a6..ea9ef1b1 100644 Binary files a/book/06-github/images/account-settings.png and b/book/06-github/images/account-settings.png differ diff --git a/book/06-github/images/avatar-crop.png b/book/06-github/images/avatar-crop.png index cd1671ae..622e05d8 100644 Binary files a/book/06-github/images/avatar-crop.png and b/book/06-github/images/avatar-crop.png differ diff --git a/book/06-github/images/blink-01-start.png b/book/06-github/images/blink-01-start.png index be140e19..ccf06e7c 100644 Binary files a/book/06-github/images/blink-01-start.png and b/book/06-github/images/blink-01-start.png differ diff --git a/book/06-github/images/blink-02-pr.png b/book/06-github/images/blink-02-pr.png index 96816571..ec9f08c5 100644 Binary files a/book/06-github/images/blink-02-pr.png and b/book/06-github/images/blink-02-pr.png differ diff --git a/book/06-github/images/blink-03-pull-request-open.png b/book/06-github/images/blink-03-pull-request-open.png index 70350865..442a3294 100644 Binary files a/book/06-github/images/blink-03-pull-request-open.png and b/book/06-github/images/blink-03-pull-request-open.png differ diff --git a/book/06-github/images/blink-04-email.png b/book/06-github/images/blink-04-email.png index af3090e7..52b61378 100644 Binary files a/book/06-github/images/blink-04-email.png and b/book/06-github/images/blink-04-email.png differ diff --git a/book/06-github/images/blink-04-pr-comment.png b/book/06-github/images/blink-04-pr-comment.png index 4e31e773..46402d55 100644 Binary files a/book/06-github/images/blink-04-pr-comment.png and b/book/06-github/images/blink-04-pr-comment.png differ diff --git a/book/06-github/images/blink-05-general-comment.png b/book/06-github/images/blink-05-general-comment.png index 1c3f4f3e..7cf1205f 100644 Binary files a/book/06-github/images/blink-05-general-comment.png and b/book/06-github/images/blink-05-general-comment.png differ diff --git a/book/06-github/images/blink-06-final.png b/book/06-github/images/blink-06-final.png index 06dc9de6..155a5ef4 100644 Binary files a/book/06-github/images/blink-06-final.png and b/book/06-github/images/blink-06-final.png differ diff --git a/book/06-github/images/blink-pull-request-open copy.png b/book/06-github/images/blink-pull-request-open copy.png index ad7976e3..5e40c6d9 100644 Binary files a/book/06-github/images/blink-pull-request-open copy.png and b/book/06-github/images/blink-pull-request-open copy.png differ diff --git a/book/06-github/images/blink-pull-request-open.png b/book/06-github/images/blink-pull-request-open.png index 3c43df3c..223144c2 100644 Binary files a/book/06-github/images/blink-pull-request-open.png and b/book/06-github/images/blink-pull-request-open.png differ diff --git a/book/06-github/images/collaborators.png b/book/06-github/images/collaborators.png index ba126100..01a480d5 100644 Binary files a/book/06-github/images/collaborators.png and b/book/06-github/images/collaborators.png differ diff --git a/book/06-github/images/email-settings.png b/book/06-github/images/email-settings.png index 0291aeac..b073ded3 100644 Binary files a/book/06-github/images/email-settings.png and b/book/06-github/images/email-settings.png differ diff --git a/book/06-github/images/emoji.png b/book/06-github/images/emoji.png index 83c8cd21..42b01fb0 100644 Binary files a/book/06-github/images/emoji.png and b/book/06-github/images/emoji.png differ diff --git a/book/06-github/images/forkbutton.png b/book/06-github/images/forkbutton.png index 9bc4c798..8ce7ff22 100644 Binary files a/book/06-github/images/forkbutton.png and b/book/06-github/images/forkbutton.png differ diff --git a/book/06-github/images/hubot.png b/book/06-github/images/hubot.png index 510b265f..b057f1de 100644 Binary files a/book/06-github/images/hubot.png and b/book/06-github/images/hubot.png differ diff --git a/book/06-github/images/maint-01-email.png b/book/06-github/images/maint-01-email.png index 1477b36d..6de46981 100644 Binary files a/book/06-github/images/maint-01-email.png and b/book/06-github/images/maint-01-email.png differ diff --git a/book/06-github/images/maint-02-merge.png b/book/06-github/images/maint-02-merge.png index 69efa4b6..62ba7f74 100644 Binary files a/book/06-github/images/maint-02-merge.png and b/book/06-github/images/maint-02-merge.png differ diff --git a/book/06-github/images/maint-03-email-resp.png b/book/06-github/images/maint-03-email-resp.png index dbd3e648..0d2a096c 100644 Binary files a/book/06-github/images/maint-03-email-resp.png and b/book/06-github/images/maint-03-email-resp.png differ diff --git a/book/06-github/images/maint-04-target.png b/book/06-github/images/maint-04-target.png index 0b153962..1a6476fa 100644 Binary files a/book/06-github/images/maint-04-target.png and b/book/06-github/images/maint-04-target.png differ diff --git a/book/06-github/images/maint-05-mentions.png b/book/06-github/images/maint-05-mentions.png index 35b60f3d..4660bbc7 100644 Binary files a/book/06-github/images/maint-05-mentions.png and b/book/06-github/images/maint-05-mentions.png differ diff --git a/book/06-github/images/maint-06-unsubscribe.png b/book/06-github/images/maint-06-unsubscribe.png index eaf6e2cf..e0689451 100644 Binary files a/book/06-github/images/maint-06-unsubscribe.png and b/book/06-github/images/maint-06-unsubscribe.png differ diff --git a/book/06-github/images/maint-07-notifications.png b/book/06-github/images/maint-07-notifications.png index 7d07a4b2..a8665093 100644 Binary files a/book/06-github/images/maint-07-notifications.png and b/book/06-github/images/maint-07-notifications.png differ diff --git a/book/06-github/images/maint-08-notifications-page.png b/book/06-github/images/maint-08-notifications-page.png index d4998614..3008539b 100644 Binary files a/book/06-github/images/maint-08-notifications-page.png and b/book/06-github/images/maint-08-notifications-page.png differ diff --git a/book/06-github/images/maint-09-contrib.png b/book/06-github/images/maint-09-contrib.png index f6d9af3c..bb2a1726 100644 Binary files a/book/06-github/images/maint-09-contrib.png and b/book/06-github/images/maint-09-contrib.png differ diff --git a/book/06-github/images/maint-10-default-branch.png b/book/06-github/images/maint-10-default-branch.png index bd251d6c..4fed6970 100644 Binary files a/book/06-github/images/maint-10-default-branch.png and b/book/06-github/images/maint-10-default-branch.png differ diff --git a/book/06-github/images/maint-11-transfer.png b/book/06-github/images/maint-11-transfer.png index 5dc5724c..a55e385c 100644 Binary files a/book/06-github/images/maint-11-transfer.png and b/book/06-github/images/maint-11-transfer.png differ diff --git a/book/06-github/images/markdown-01-example.png b/book/06-github/images/markdown-01-example.png index 10bbf18c..455fe32a 100644 Binary files a/book/06-github/images/markdown-01-example.png and b/book/06-github/images/markdown-01-example.png differ diff --git a/book/06-github/images/markdown-02-tasks.png b/book/06-github/images/markdown-02-tasks.png index 6dafbc73..00cf536e 100644 Binary files a/book/06-github/images/markdown-02-tasks.png and b/book/06-github/images/markdown-02-tasks.png differ diff --git a/book/06-github/images/markdown-03-task-summary.png b/book/06-github/images/markdown-03-task-summary.png index 536aa094..8168ed12 100644 Binary files a/book/06-github/images/markdown-03-task-summary.png and b/book/06-github/images/markdown-03-task-summary.png differ diff --git a/book/06-github/images/markdown-04-fenced-code.png b/book/06-github/images/markdown-04-fenced-code.png index ca3482f9..c9335f5c 100644 Binary files a/book/06-github/images/markdown-04-fenced-code.png and b/book/06-github/images/markdown-04-fenced-code.png differ diff --git a/book/06-github/images/markdown-05-quote.png b/book/06-github/images/markdown-05-quote.png index 02a8451a..83f62d39 100644 Binary files a/book/06-github/images/markdown-05-quote.png and b/book/06-github/images/markdown-05-quote.png differ diff --git a/book/06-github/images/markdown-06-emoji-complete.png b/book/06-github/images/markdown-06-emoji-complete.png index ce949200..840d7014 100644 Binary files a/book/06-github/images/markdown-06-emoji-complete.png and b/book/06-github/images/markdown-06-emoji-complete.png differ diff --git a/book/06-github/images/markdown-07-emoji.png b/book/06-github/images/markdown-07-emoji.png index b535756d..e94cc138 100644 Binary files a/book/06-github/images/markdown-07-emoji.png and b/book/06-github/images/markdown-07-emoji.png differ diff --git a/book/06-github/images/markdown-08-drag-drop.png b/book/06-github/images/markdown-08-drag-drop.png index 1dfb3b98..983b9f96 100644 Binary files a/book/06-github/images/markdown-08-drag-drop.png and b/book/06-github/images/markdown-08-drag-drop.png differ diff --git a/book/06-github/images/mentions-01-syntax.png b/book/06-github/images/mentions-01-syntax.png index c960b0c9..87a22a0a 100644 Binary files a/book/06-github/images/mentions-01-syntax.png and b/book/06-github/images/mentions-01-syntax.png differ diff --git a/book/06-github/images/mentions-02-render.png b/book/06-github/images/mentions-02-render.png index 5b4bfee3..9cbd2b7b 100644 Binary files a/book/06-github/images/mentions-02-render.png and b/book/06-github/images/mentions-02-render.png differ diff --git a/book/06-github/images/mentions-03-closed.png b/book/06-github/images/mentions-03-closed.png index cf3ef9e2..202563bd 100644 Binary files a/book/06-github/images/mentions-03-closed.png and b/book/06-github/images/mentions-03-closed.png differ diff --git a/book/06-github/images/new-repo.png b/book/06-github/images/new-repo.png index 485515bd..4e4f1623 100644 Binary files a/book/06-github/images/new-repo.png and b/book/06-github/images/new-repo.png differ diff --git a/book/06-github/images/neworg.png b/book/06-github/images/neworg.png index db47fff0..a4491c40 100644 Binary files a/book/06-github/images/neworg.png and b/book/06-github/images/neworg.png differ diff --git a/book/06-github/images/newrepo.png b/book/06-github/images/newrepo.png index cd508f16..952cb2fb 100644 Binary files a/book/06-github/images/newrepo.png and b/book/06-github/images/newrepo.png differ diff --git a/book/06-github/images/newrepoform.png b/book/06-github/images/newrepoform.png index 28fa6a7e..dc49a50b 100644 Binary files a/book/06-github/images/newrepoform.png and b/book/06-github/images/newrepoform.png differ diff --git a/book/06-github/images/notifications.png b/book/06-github/images/notifications.png index 6768db4d..31e05951 100644 Binary files a/book/06-github/images/notifications.png and b/book/06-github/images/notifications.png differ diff --git a/book/06-github/images/orgs-01-page.png b/book/06-github/images/orgs-01-page.png index 149773fe..82006b79 100644 Binary files a/book/06-github/images/orgs-01-page.png and b/book/06-github/images/orgs-01-page.png differ diff --git a/book/06-github/images/orgs-02-teams.png b/book/06-github/images/orgs-02-teams.png index 46f5f2ce..7183746e 100644 Binary files a/book/06-github/images/orgs-02-teams.png and b/book/06-github/images/orgs-02-teams.png differ diff --git a/book/06-github/images/orgs-03-audit.png b/book/06-github/images/orgs-03-audit.png index 4f063989..3a353af3 100644 Binary files a/book/06-github/images/orgs-03-audit.png and b/book/06-github/images/orgs-03-audit.png differ diff --git a/book/06-github/images/pr-01-fail.png b/book/06-github/images/pr-01-fail.png index 80331c1d..2337656a 100644 Binary files a/book/06-github/images/pr-01-fail.png and b/book/06-github/images/pr-01-fail.png differ diff --git a/book/06-github/images/pr-02-merge-fix.png b/book/06-github/images/pr-02-merge-fix.png index 9da16322..cc2bafdf 100644 Binary files a/book/06-github/images/pr-02-merge-fix.png and b/book/06-github/images/pr-02-merge-fix.png differ diff --git a/book/06-github/images/reposettingslink.png b/book/06-github/images/reposettingslink.png index 45e60162..a3f0db44 100644 Binary files a/book/06-github/images/reposettingslink.png and b/book/06-github/images/reposettingslink.png differ diff --git a/book/06-github/images/scripting-01-services.png b/book/06-github/images/scripting-01-services.png index 07c20103..3af65a12 100644 Binary files a/book/06-github/images/scripting-01-services.png and b/book/06-github/images/scripting-01-services.png differ diff --git a/book/06-github/images/scripting-02-email-service.png b/book/06-github/images/scripting-02-email-service.png index 209bfe76..b1e59497 100644 Binary files a/book/06-github/images/scripting-02-email-service.png and b/book/06-github/images/scripting-02-email-service.png differ diff --git a/book/06-github/images/scripting-03-webhook.png b/book/06-github/images/scripting-03-webhook.png index 103eb92a..bf90bcb7 100644 Binary files a/book/06-github/images/scripting-03-webhook.png and b/book/06-github/images/scripting-03-webhook.png differ diff --git a/book/06-github/images/scripting-04-webhook-debug.png b/book/06-github/images/scripting-04-webhook-debug.png index 617e41ee..e91c9e29 100644 Binary files a/book/06-github/images/scripting-04-webhook-debug.png and b/book/06-github/images/scripting-04-webhook-debug.png differ diff --git a/book/06-github/images/scripting-05-access-token.png b/book/06-github/images/scripting-05-access-token.png index 17507717..f4041423 100644 Binary files a/book/06-github/images/scripting-05-access-token.png and b/book/06-github/images/scripting-05-access-token.png differ diff --git a/book/06-github/images/scripting-06-comment.png b/book/06-github/images/scripting-06-comment.png index 52448174..7dd27911 100644 Binary files a/book/06-github/images/scripting-06-comment.png and b/book/06-github/images/scripting-06-comment.png differ diff --git a/book/06-github/images/scripting-07-status.png b/book/06-github/images/scripting-07-status.png index a34314d9..b0dad61e 100644 Binary files a/book/06-github/images/scripting-07-status.png and b/book/06-github/images/scripting-07-status.png differ diff --git a/book/06-github/images/signup.png b/book/06-github/images/signup.png index 916a882c..73e8d9a6 100644 Binary files a/book/06-github/images/signup.png and b/book/06-github/images/signup.png differ diff --git a/book/06-github/images/ssh-keys.png b/book/06-github/images/ssh-keys.png index b9dec471..34c0ff88 100644 Binary files a/book/06-github/images/ssh-keys.png and b/book/06-github/images/ssh-keys.png differ diff --git a/book/06-github/images/your-profile.png b/book/06-github/images/your-profile.png index 50fa0c1e..01373f60 100644 Binary files a/book/06-github/images/your-profile.png and b/book/06-github/images/your-profile.png differ diff --git a/book/06-github/sections/3-maintaining.asc b/book/06-github/sections/3-maintaining.asc index 7a9e52c8..8ca6803e 100644 --- a/book/06-github/sections/3-maintaining.asc +++ b/book/06-github/sections/3-maintaining.asc @@ -23,7 +23,7 @@ image::images/newrepoform.png[The ``new repository'' form.] All you really have to do here is provide a project name; the rest of the fields are completely optional. For now, just click the ``Create Repository'' button, and boom – you have a new repository on GitHub, named `/`. -Since you have no code there yet, GitHub will show you instructions for how create a brand-new Git repository, or connect an existing Git project. +Since you have no code there yet, GitHub will show you instructions for how to create a brand-new Git repository, or connect an existing Git project. We won't belabor this here; if you need a refresher, check out <<_git_basics_chapter>>. Now that your project is hosted on GitHub, you can give the URL to anyone you want to share your project with. diff --git a/book/06-github/sections/5-scripting.asc b/book/06-github/sections/5-scripting.asc index 2375351f..fe474b7b 100644 --- a/book/06-github/sections/5-scripting.asc +++ b/book/06-github/sections/5-scripting.asc @@ -224,7 +224,7 @@ You can use the API to do just about anything you can do on the website -- creat ==== Changing the Status of a Pull Request -One final example we'll look at since it's really useful if you're working with Pull Requests. +There is one final example we'll look at since it's really useful if you're working with Pull Requests. Each commit can have one or more statuses associated with it and there is an API to add and query that status. Most of the Continuous Integration and testing services make use of this API to react to pushes by testing the code that was pushed, and then report back if that commit has passed all the tests. diff --git a/book/07-git-tools/callouts/10.png b/book/07-git-tools/callouts/10.png index 80872645..821ef4ce 100644 Binary files a/book/07-git-tools/callouts/10.png and b/book/07-git-tools/callouts/10.png differ diff --git a/book/07-git-tools/callouts/2.png b/book/07-git-tools/callouts/2.png index 4bb6abc0..e881df13 100644 Binary files a/book/07-git-tools/callouts/2.png and b/book/07-git-tools/callouts/2.png differ diff --git a/book/07-git-tools/callouts/3.png b/book/07-git-tools/callouts/3.png index e132a559..200d5825 100644 Binary files a/book/07-git-tools/callouts/3.png and b/book/07-git-tools/callouts/3.png differ diff --git a/book/07-git-tools/callouts/5.png b/book/07-git-tools/callouts/5.png index 76375432..e52d3a84 100644 Binary files a/book/07-git-tools/callouts/5.png and b/book/07-git-tools/callouts/5.png differ diff --git a/book/07-git-tools/callouts/7.png b/book/07-git-tools/callouts/7.png index 009bf1a1..f07d991f 100644 Binary files a/book/07-git-tools/callouts/7.png and b/book/07-git-tools/callouts/7.png differ diff --git a/book/07-git-tools/callouts/8.png b/book/07-git-tools/callouts/8.png index 2470994e..c99ae9e7 100644 Binary files a/book/07-git-tools/callouts/8.png and b/book/07-git-tools/callouts/8.png differ diff --git a/book/07-git-tools/images/double-dot.png b/book/07-git-tools/images/double-dot.png index a95ba68a..53175c15 100644 Binary files a/book/07-git-tools/images/double-dot.png and b/book/07-git-tools/images/double-dot.png differ diff --git a/book/07-git-tools/images/replace1.png b/book/07-git-tools/images/replace1.png index 100610c5..f5a23f7f 100644 Binary files a/book/07-git-tools/images/replace1.png and b/book/07-git-tools/images/replace1.png differ diff --git a/book/07-git-tools/images/replace2.png b/book/07-git-tools/images/replace2.png index 58fb531d..5b03076c 100644 Binary files a/book/07-git-tools/images/replace2.png and b/book/07-git-tools/images/replace2.png differ diff --git a/book/07-git-tools/images/replace3.png b/book/07-git-tools/images/replace3.png index 3fafe80a..5c3191cd 100644 Binary files a/book/07-git-tools/images/replace3.png and b/book/07-git-tools/images/replace3.png differ diff --git a/book/07-git-tools/images/replace4.png b/book/07-git-tools/images/replace4.png index 021319ef..553820c0 100644 Binary files a/book/07-git-tools/images/replace4.png and b/book/07-git-tools/images/replace4.png differ diff --git a/book/07-git-tools/images/replace5.png b/book/07-git-tools/images/replace5.png index 74b8523e..41e7cd7b 100644 Binary files a/book/07-git-tools/images/replace5.png and b/book/07-git-tools/images/replace5.png differ diff --git a/book/07-git-tools/images/rerere1.png b/book/07-git-tools/images/rerere1.png index 06bcef32..34ab3b7b 100644 Binary files a/book/07-git-tools/images/rerere1.png and b/book/07-git-tools/images/rerere1.png differ diff --git a/book/07-git-tools/images/rerere2.png b/book/07-git-tools/images/rerere2.png index 36021e32..85dd47f4 100644 Binary files a/book/07-git-tools/images/rerere2.png and b/book/07-git-tools/images/rerere2.png differ diff --git a/book/07-git-tools/images/rerere3.png b/book/07-git-tools/images/rerere3.png index 83e29b75..b299ac74 100644 Binary files a/book/07-git-tools/images/rerere3.png and b/book/07-git-tools/images/rerere3.png differ diff --git a/book/07-git-tools/images/reset-checkout.png b/book/07-git-tools/images/reset-checkout.png index 69b2f892..fe036345 100644 Binary files a/book/07-git-tools/images/reset-checkout.png and b/book/07-git-tools/images/reset-checkout.png differ diff --git a/book/07-git-tools/images/reset-ex1.png b/book/07-git-tools/images/reset-ex1.png index b1adbfe9..2ffd68b2 100644 Binary files a/book/07-git-tools/images/reset-ex1.png and b/book/07-git-tools/images/reset-ex1.png differ diff --git a/book/07-git-tools/images/reset-ex2.png b/book/07-git-tools/images/reset-ex2.png index 6cac4be0..f4ffd2a7 100644 Binary files a/book/07-git-tools/images/reset-ex2.png and b/book/07-git-tools/images/reset-ex2.png differ diff --git a/book/07-git-tools/images/reset-ex3.png b/book/07-git-tools/images/reset-ex3.png index e29b78c4..74274933 100644 Binary files a/book/07-git-tools/images/reset-ex3.png and b/book/07-git-tools/images/reset-ex3.png differ diff --git a/book/07-git-tools/images/reset-ex4.png b/book/07-git-tools/images/reset-ex4.png index 0fb210a9..3cfbf7fc 100644 Binary files a/book/07-git-tools/images/reset-ex4.png and b/book/07-git-tools/images/reset-ex4.png differ diff --git a/book/07-git-tools/images/reset-ex5.png b/book/07-git-tools/images/reset-ex5.png index 11b00201..c21a2534 100644 Binary files a/book/07-git-tools/images/reset-ex5.png and b/book/07-git-tools/images/reset-ex5.png differ diff --git a/book/07-git-tools/images/reset-ex6.png b/book/07-git-tools/images/reset-ex6.png index 091285ee..c64cc38f 100644 Binary files a/book/07-git-tools/images/reset-ex6.png and b/book/07-git-tools/images/reset-ex6.png differ diff --git a/book/07-git-tools/images/reset-hard.png b/book/07-git-tools/images/reset-hard.png index f2f8e003..a9da7ced 100644 Binary files a/book/07-git-tools/images/reset-hard.png and b/book/07-git-tools/images/reset-hard.png differ diff --git a/book/07-git-tools/images/reset-mixed.png b/book/07-git-tools/images/reset-mixed.png index d6ae60ab..0266fe51 100644 Binary files a/book/07-git-tools/images/reset-mixed.png and b/book/07-git-tools/images/reset-mixed.png differ diff --git a/book/07-git-tools/images/reset-path1.png b/book/07-git-tools/images/reset-path1.png index 0036c409..1672e02b 100644 Binary files a/book/07-git-tools/images/reset-path1.png and b/book/07-git-tools/images/reset-path1.png differ diff --git a/book/07-git-tools/images/reset-path2.png b/book/07-git-tools/images/reset-path2.png index ca117fb7..08308e5e 100644 Binary files a/book/07-git-tools/images/reset-path2.png and b/book/07-git-tools/images/reset-path2.png differ diff --git a/book/07-git-tools/images/reset-path3.png b/book/07-git-tools/images/reset-path3.png index a6cb5d43..e01f80ae 100644 Binary files a/book/07-git-tools/images/reset-path3.png and b/book/07-git-tools/images/reset-path3.png differ diff --git a/book/07-git-tools/images/reset-soft.png b/book/07-git-tools/images/reset-soft.png index aab1fe6b..831d9f6f 100644 Binary files a/book/07-git-tools/images/reset-soft.png and b/book/07-git-tools/images/reset-soft.png differ diff --git a/book/07-git-tools/images/reset-squash-r1.png b/book/07-git-tools/images/reset-squash-r1.png index 7bd260ad..e703a309 100644 Binary files a/book/07-git-tools/images/reset-squash-r1.png and b/book/07-git-tools/images/reset-squash-r1.png differ diff --git a/book/07-git-tools/images/reset-squash-r2.png b/book/07-git-tools/images/reset-squash-r2.png index 46f9ea4e..8b3bd443 100644 Binary files a/book/07-git-tools/images/reset-squash-r2.png and b/book/07-git-tools/images/reset-squash-r2.png differ diff --git a/book/07-git-tools/images/reset-squash-r3.png b/book/07-git-tools/images/reset-squash-r3.png index 23f82730..87e44cbe 100644 Binary files a/book/07-git-tools/images/reset-squash-r3.png and b/book/07-git-tools/images/reset-squash-r3.png differ diff --git a/book/07-git-tools/images/reset-start.png b/book/07-git-tools/images/reset-start.png index bbfa8eab..70b3fb06 100644 Binary files a/book/07-git-tools/images/reset-start.png and b/book/07-git-tools/images/reset-start.png differ diff --git a/book/07-git-tools/images/reset-workflow.png b/book/07-git-tools/images/reset-workflow.png index 43bd27f3..1c01e0d5 100644 Binary files a/book/07-git-tools/images/reset-workflow.png and b/book/07-git-tools/images/reset-workflow.png differ diff --git a/book/07-git-tools/images/undomerge-reset.png b/book/07-git-tools/images/undomerge-reset.png index 99bd7f79..3ffcc624 100644 Binary files a/book/07-git-tools/images/undomerge-reset.png and b/book/07-git-tools/images/undomerge-reset.png differ diff --git a/book/07-git-tools/images/undomerge-revert.png b/book/07-git-tools/images/undomerge-revert.png index 1f32a63e..87cd7c93 100644 Binary files a/book/07-git-tools/images/undomerge-revert.png and b/book/07-git-tools/images/undomerge-revert.png differ diff --git a/book/07-git-tools/images/undomerge-revert2.png b/book/07-git-tools/images/undomerge-revert2.png index af9e5887..dc5727ea 100644 Binary files a/book/07-git-tools/images/undomerge-revert2.png and b/book/07-git-tools/images/undomerge-revert2.png differ diff --git a/book/07-git-tools/images/undomerge-revert3.png b/book/07-git-tools/images/undomerge-revert3.png index c1e8e8ba..71f94a63 100644 Binary files a/book/07-git-tools/images/undomerge-revert3.png and b/book/07-git-tools/images/undomerge-revert3.png differ diff --git a/book/07-git-tools/images/undomerge-start.png b/book/07-git-tools/images/undomerge-start.png index 5891cbed..518a71d8 100644 Binary files a/book/07-git-tools/images/undomerge-start.png and b/book/07-git-tools/images/undomerge-start.png differ diff --git a/book/07-git-tools/sections/advanced-merging.asc b/book/07-git-tools/sections/advanced-merging.asc index 0e160e96..1c376717 100644 --- a/book/07-git-tools/sections/advanced-merging.asc +++ b/book/07-git-tools/sections/advanced-merging.asc @@ -139,7 +139,7 @@ By default, Git sees all of these lines as being changed, so it can't merge the The default merge strategy can take arguments though, and a few of them are about properly ignoring whitespace changes. If you see that you have a lot of whitespace issues in a merge, you can simply abort it and do it again, this time with `-Xignore-all-space` or `-Xignore-space-change`. -The first option ignores whitespace **completely** when comparing lines, the second treats sequences of one or more whitespace characters as equivalent. +The first option ignores whitespace *completely* when comparing lines, the second treats sequences of one or more whitespace characters as equivalent. [source,console] ---- @@ -432,7 +432,7 @@ $ git log --oneline --left-right --merge ---- If you run that with the `-p` option instead, you get just the diffs to the file that ended up in conflict. -This can be **really** helpful in quickly giving you the context you need to help understand why something conflicts and how to more intelligently resolve it. +This can be *really* helpful in quickly giving you the context you need to help understand why something conflicts and how to more intelligently resolve it. ===== Combined Diff Format @@ -493,7 +493,7 @@ index 0399cd5,59727f0..0000000 This shows us that ``hola world'' was in our side but not in the working copy, that ``hello mundo'' was in their side but not in the working copy and finally that ``hola mundo'' was not in either side but is now in the working copy. This can be useful to review before committing the resolution. -You can also get this from the `git log` for any merge after the fact to see how something was resolved after the fact. +You can also get this from the `git log` for any merge to see how something was resolved after the fact. Git will output this format if you run `git show` on a merge commit, or if you add a `--cc` option to a `git log -p` (which by default only shows patches for non-merge commits). [source,console] @@ -622,7 +622,7 @@ First of all, there is another useful thing we can do with the normal ``recursiv We've already seen the `ignore-all-space` and `ignore-space-change` options which are passed with a `-X` but we can also tell Git to favor one side or the other when it sees a conflict. By default, when Git sees a conflict between two branches being merged, it will add merge conflict markers into your code and mark the file as conflicted and let you resolve it. -If you would prefer for Git to simply choose a specific side and ignore the other side instead of letting you manually merge the conflict, you can pass the `merge` command either a `-Xours` or `-Xtheirs`. +If you would prefer for Git to simply choose a specific side and ignore the other side instead of letting you manually resolve the conflict, you can pass the `merge` command either a `-Xours` or `-Xtheirs`. If Git sees this, it will not add conflict markers. Any differences that are mergeable, it will merge. diff --git a/book/07-git-tools/sections/bundling.asc b/book/07-git-tools/sections/bundling.asc index 369a4a84..489f455f 100644 --- a/book/07-git-tools/sections/bundling.asc +++ b/book/07-git-tools/sections/bundling.asc @@ -56,7 +56,8 @@ You can clone from the binary file into a directory, much like you would from a [source,console] ---- $ git clone repo.bundle repo -Initialized empty Git repository in /private/tmp/bundle/repo/.git/ +Cloning into 'repo'... +... $ cd repo $ git log --oneline 9a466c5 second commit diff --git a/book/07-git-tools/sections/credentials.asc b/book/07-git-tools/sections/credentials.asc index 61b2d8d0..f8241814 100644 --- a/book/07-git-tools/sections/credentials.asc +++ b/book/07-git-tools/sections/credentials.asc @@ -19,9 +19,8 @@ Git has a few options provided in the box: The downside of this approach is that your passwords are stored in cleartext in a plain file in your home directory. * If you're using a Mac, Git comes with an ``osxkeychain'' mode, which caches credentials in the secure keychain that's attached to your system account. This method stores the credentials on disk, and they never expire, but they're encrypted with the same system that stores HTTPS certificates and Safari auto-fills. -* If you're using Windows, you can install a helper called ``winstore.'' +* If you're using Windows, you can install a helper called ``wincred.'' This is similar to the ``osxkeychain'' helper described above, but uses the Windows Credential Store to control sensitive information. - It can be found at https://gitcredentialstore.codeplex.com[]. You can choose one of these methods by setting a Git configuration value: @@ -145,7 +144,7 @@ https://bob:s3cre7@mygithost ---- It's just a series of lines, each of which contains a credential-decorated URL. -The `osxkeychain` and `winstore` helpers use the native format of their backing stores, while `cache` uses its own in-memory format (which no other process can read). +The `osxkeychain` and `wincred` helpers use the native format of their backing stores, while `cache` uses its own in-memory format (which no other process can read). ==== A Custom Credential Cache diff --git a/book/07-git-tools/sections/replace.asc b/book/07-git-tools/sections/replace.asc index c2b08f1f..7e504bfd 100644 --- a/book/07-git-tools/sections/replace.asc +++ b/book/07-git-tools/sections/replace.asc @@ -92,7 +92,7 @@ $ echo 'get history from blah blah blah' | git commit-tree 9c68fdc^{tree} [NOTE] ===== The `commit-tree` command is one of a set of commands that are commonly referred to as 'plumbing' commands. -These are commands that are not generally meant to be used directly, but instead are used by **other** Git commands to do smaller jobs. +These are commands that are not generally meant to be used directly, but instead are used by *other* Git commands to do smaller jobs. On occasions when we're doing weirder things like this, they allow us to do really low-level things but are not meant for daily use. You can read more about plumbing commands in <<_plumbing_porcelain>> ===== diff --git a/book/07-git-tools/sections/reset.asc b/book/07-git-tools/sections/reset.asc index 205b07c7..e7b1091a 100644 --- a/book/07-git-tools/sections/reset.asc +++ b/book/07-git-tools/sections/reset.asc @@ -185,7 +185,7 @@ If you use the `--hard` option, it will continue to this stage. image::images/reset-hard.png[] So let's think about what just happened. -You undid your last commit, the `git add` and `git commit` commands, **and** all the work you did in your working directory. +You undid your last commit, the `git add` and `git commit` commands, *and* all the work you did in your working directory. It's important to note that this flag (`--hard`) is the only way to make the `reset` command dangerous, and one of the very few cases where Git will actually destroy data. Any other invocation of `reset` can be pretty easily undone, but the `--hard` option cannot, since it forcibly overwrites files in the Working Directory. diff --git a/book/07-git-tools/sections/searching.asc b/book/07-git-tools/sections/searching.asc index 4b55d6a9..3d728051 100644 --- a/book/07-git-tools/sections/searching.asc +++ b/book/07-git-tools/sections/searching.asc @@ -92,7 +92,7 @@ As we saw in the above example, we looked for terms in an older version of the G ==== Git Log Searching -Perhaps you're looking not for **where** a term exists, but **when** it existed or was introduced. +Perhaps you're looking not for *where* a term exists, but *when* it existed or was introduced. The `git log` command has a number of powerful tools for finding specific commits by the content of their messages or even the content of the diff they introduce. If we want to find out for example when the `ZLIB_BUF_MAX` constant was originally introduced, we can tell Git to only show us the commits that either added or removed that string with the `-S` option. diff --git a/book/07-git-tools/sections/submodules.asc b/book/07-git-tools/sections/submodules.asc index 2a6230a9..577d0bee 100644 --- a/book/07-git-tools/sections/submodules.asc +++ b/book/07-git-tools/sections/submodules.asc @@ -363,7 +363,7 @@ 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` 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. ===== Working on a Submodule @@ -647,11 +647,11 @@ $ git commit -m "Merge Tom's Changes" <5> It can be a bit confusing, but it's really not very hard. Interestingly, there is another case that Git handles. -If a merge commit exists in the submodule directory that contains **both** commits in its history, Git will suggest it to you as a possible solution. +If a merge commit exists in the submodule directory that contains *both* commits in its history, Git will suggest it to you as a possible solution. It sees that at some point in the submodule project, someone merged branches containing these two commits, so maybe you'll want that one. This is why the error message from before was ``merge following commits not found'', because it could not do *this*. -It's confusing because who would expect it to **try** to do this? +It's confusing because who would expect it to *try* to do this? If it does find a single acceptable merge commit, you'll see something like this: diff --git a/book/08-customizing-git/images/clean.png b/book/08-customizing-git/images/clean.png index eed88a53..ec8fcaa5 100644 Binary files a/book/08-customizing-git/images/clean.png and b/book/08-customizing-git/images/clean.png differ diff --git a/book/08-customizing-git/images/p4merge.png b/book/08-customizing-git/images/p4merge.png index b051b7a6..776b74f5 100644 Binary files a/book/08-customizing-git/images/p4merge.png and b/book/08-customizing-git/images/p4merge.png differ diff --git a/book/08-customizing-git/images/smudge.png b/book/08-customizing-git/images/smudge.png index 1edd3866..d86aa05c 100644 Binary files a/book/08-customizing-git/images/smudge.png and b/book/08-customizing-git/images/smudge.png differ diff --git a/book/08-customizing-git/sections/hooks.asc b/book/08-customizing-git/sections/hooks.asc index 95fa90f3..18dd50b2 100644 --- a/book/08-customizing-git/sections/hooks.asc +++ b/book/08-customizing-git/sections/hooks.asc @@ -15,7 +15,7 @@ When you initialize a new repository with `git init`, Git populates the hooks di All the examples are written as shell scripts, with some Perl thrown in, but any properly named executable scripts will work fine – you can write them in Ruby or Python or what have you. If you want to use the bundled hook scripts, you'll have to rename them; their file names all end with `.sample`. -To enable a hook script, put a file in the `hooks` subdirectory of your Git directory that is named appropriately and is executable. +To enable a hook script, put a file in the `hooks` subdirectory of your .git directory that is named appropriately (without any extension) and is executable. From that point forward, it should be called. We'll cover most of the major hook filenames here. diff --git a/book/09-git-and-other-scms/images/git-fusion-boot.png b/book/09-git-and-other-scms/images/git-fusion-boot.png index 07bdbbeb..79272afe 100644 Binary files a/book/09-git-and-other-scms/images/git-fusion-boot.png and b/book/09-git-and-other-scms/images/git-fusion-boot.png differ diff --git a/book/09-git-and-other-scms/images/git-fusion-perforce-graph.png b/book/09-git-and-other-scms/images/git-fusion-perforce-graph.png index 0883befb..022293cd 100644 Binary files a/book/09-git-and-other-scms/images/git-fusion-perforce-graph.png and b/book/09-git-and-other-scms/images/git-fusion-perforce-graph.png differ diff --git a/book/09-git-and-other-scms/images/git-tfs-ct.png b/book/09-git-and-other-scms/images/git-tfs-ct.png index e6311fe1..d081f272 100644 Binary files a/book/09-git-and-other-scms/images/git-tfs-ct.png and b/book/09-git-and-other-scms/images/git-tfs-ct.png differ diff --git a/book/09-git-and-other-scms/sections/import-hg.asc b/book/09-git-and-other-scms/sections/import-hg.asc index 4acf4537..72839987 100644 --- a/book/09-git-and-other-scms/sections/import-hg.asc +++ b/book/09-git-and-other-scms/sections/import-hg.asc @@ -46,8 +46,8 @@ In this example, we want our file to look like this: ---- bob=Bob Jones bob@localhost=Bob Jones -bob jones company com>=Bob Jones bob =Bob Jones +bob jones company com>=Bob Jones ---- The next step is to create our new Git repository, and run the export script: diff --git a/book/10-git-internals/images/data-model-1.png b/book/10-git-internals/images/data-model-1.png index d11b69c0..9331e915 100644 Binary files a/book/10-git-internals/images/data-model-1.png and b/book/10-git-internals/images/data-model-1.png differ diff --git a/book/10-git-internals/images/data-model-2.png b/book/10-git-internals/images/data-model-2.png index ca6b9ba6..eb1d48e1 100644 Binary files a/book/10-git-internals/images/data-model-2.png and b/book/10-git-internals/images/data-model-2.png differ diff --git a/book/10-git-internals/images/data-model-3.png b/book/10-git-internals/images/data-model-3.png index 8f76ae1f..317acbb0 100644 Binary files a/book/10-git-internals/images/data-model-3.png and b/book/10-git-internals/images/data-model-3.png differ diff --git a/book/10-git-internals/images/data-model-4.png b/book/10-git-internals/images/data-model-4.png index ea9734f2..38136440 100644 Binary files a/book/10-git-internals/images/data-model-4.png and b/book/10-git-internals/images/data-model-4.png differ diff --git a/book/10-git-internals/sections/transfer-protocols.asc b/book/10-git-internals/sections/transfer-protocols.asc index 0a7d8ab4..806de24c 100644 --- a/book/10-git-internals/sections/transfer-protocols.asc +++ b/book/10-git-internals/sections/transfer-protocols.asc @@ -154,8 +154,7 @@ The `git-receive-pack` command immediately responds with one line for each refer 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 005b, which is hexadecimal for 91, meaning that 91 bytes remain on that line. -The next line starts with 003e, which is 62, so you read the remaining 62 bytes. +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. Now that it knows the server's state, your `send-pack` process determines what commits it has that the server doesn't. diff --git a/book/A-git-in-other-environments/images/branch_widget_mac.png b/book/A-git-in-other-environments/images/branch_widget_mac.png index 73b00b35..3361dca4 100644 Binary files a/book/A-git-in-other-environments/images/branch_widget_mac.png and b/book/A-git-in-other-environments/images/branch_widget_mac.png differ diff --git a/book/A-git-in-other-environments/images/branch_widget_win.png b/book/A-git-in-other-environments/images/branch_widget_win.png index 285195ed..11e2f1c4 100644 Binary files a/book/A-git-in-other-environments/images/branch_widget_win.png and b/book/A-git-in-other-environments/images/branch_widget_win.png differ diff --git a/book/A-git-in-other-environments/images/egit.png b/book/A-git-in-other-environments/images/egit.png index 284ebe7f..27a7011a 100644 Binary files a/book/A-git-in-other-environments/images/egit.png and b/book/A-git-in-other-environments/images/egit.png differ diff --git a/book/A-git-in-other-environments/images/git-bash.png b/book/A-git-in-other-environments/images/git-bash.png index 59f00bb8..a0bbfb23 100644 Binary files a/book/A-git-in-other-environments/images/git-bash.png and b/book/A-git-in-other-environments/images/git-bash.png differ diff --git a/book/A-git-in-other-environments/images/git-gui.png b/book/A-git-in-other-environments/images/git-gui.png index 9c988047..6d05a94c 100644 Binary files a/book/A-git-in-other-environments/images/git-gui.png and b/book/A-git-in-other-environments/images/git-gui.png differ diff --git a/book/A-git-in-other-environments/images/github_mac.png b/book/A-git-in-other-environments/images/github_mac.png index acd59cfe..5e3aea0d 100644 Binary files a/book/A-git-in-other-environments/images/github_mac.png and b/book/A-git-in-other-environments/images/github_mac.png differ diff --git a/book/A-git-in-other-environments/images/github_win.png b/book/A-git-in-other-environments/images/github_win.png index 1780863d..33134562 100644 Binary files a/book/A-git-in-other-environments/images/github_win.png and b/book/A-git-in-other-environments/images/github_win.png differ diff --git a/book/A-git-in-other-environments/images/gitk.png b/book/A-git-in-other-environments/images/gitk.png index 9fac838d..16ee0e27 100644 Binary files a/book/A-git-in-other-environments/images/gitk.png and b/book/A-git-in-other-environments/images/gitk.png differ diff --git a/book/A-git-in-other-environments/images/posh-git.png b/book/A-git-in-other-environments/images/posh-git.png index 0d087574..f66505cf 100644 Binary files a/book/A-git-in-other-environments/images/posh-git.png and b/book/A-git-in-other-environments/images/posh-git.png differ diff --git a/book/A-git-in-other-environments/images/vs-1.png b/book/A-git-in-other-environments/images/vs-1.png index 5c4e9291..312cde3b 100644 Binary files a/book/A-git-in-other-environments/images/vs-1.png and b/book/A-git-in-other-environments/images/vs-1.png differ diff --git a/book/A-git-in-other-environments/images/vs-2.png b/book/A-git-in-other-environments/images/vs-2.png index a70ff9f0..78d404c2 100644 Binary files a/book/A-git-in-other-environments/images/vs-2.png and b/book/A-git-in-other-environments/images/vs-2.png differ diff --git a/book/A-git-in-other-environments/images/zsh-oh-my.png b/book/A-git-in-other-environments/images/zsh-oh-my.png index 15cac3a9..dd1d4e06 100644 Binary files a/book/A-git-in-other-environments/images/zsh-oh-my.png and b/book/A-git-in-other-environments/images/zsh-oh-my.png differ diff --git a/book/A-git-in-other-environments/images/zsh-prompt.png b/book/A-git-in-other-environments/images/zsh-prompt.png index cf609fb3..634a8c5a 100644 Binary files a/book/A-git-in-other-environments/images/zsh-prompt.png and b/book/A-git-in-other-environments/images/zsh-prompt.png differ diff --git a/book/A-git-in-other-environments/sections/zsh.asc b/book/A-git-in-other-environments/sections/zsh.asc index 4a627178..a2598569 100644 --- a/book/A-git-in-other-environments/sections/zsh.asc +++ b/book/A-git-in-other-environments/sections/zsh.asc @@ -1,8 +1,8 @@ === Git in Zsh (((zsh)))(((tab completion, zsh)))(((shell prompts, zsh))) -Git also ships with a tab-completion library for Zsh. -Just copy `contrib/completion/git-completion.zsh` to your home directory and source it from your `.zshrc`. +Zsh also ships with a tab-completion library for Git. +To use it, simply run `autoload -Uz compinit && compinit` in your `.zshrc`. Zsh's interface is a bit more powerful than Bash's: [source,console] @@ -17,24 +17,36 @@ cherry-pick -- apply changes introduced by some existing commits ---- Ambiguous tab-completions aren't just listed; they have helpful descriptions, and you can graphically navigate the list by repeatedly hitting tab. -This works with Git commands, their arguments, and names of things inside the repository (like refs and remotes), as well filenames and all the other things Zsh knows how to tab-complete. +This works with Git commands, their arguments, and names of things inside the repository (like refs and remotes), as well as filenames and all the other things Zsh knows how to tab-complete. -Zsh happens to be fairly compatible with Bash when it comes to prompt customization, but it allows you to have a right-side prompt as well. -To include the branch name on the right side, add these lines to your `~/.zshrc` file: +Zsh ships with a framework for getting information from version control systems, called `vcs_info`. +To include the branch name in the prompt on the right side, add these lines to your `~/.zshrc` file: [source,console] ---- +autoload -Uz vcs_info +precmd_vcs_info() { vcs_info } +precmd_functions+=( precmd_vcs_info ) setopt prompt_subst -. ~/git-prompt.sh -export RPROMPT=$'$(__git_ps1 "%s")' +RPROMPT=\$vcs_info_msg_0_ +# PROMPT=\$vcs_info_msg_0_'%# ' +zstyle ':vcs_info:git:*' formats '%b' ---- This results in a display of the current branch on the right-hand side of the terminal window, whenever your shell is inside a Git repository. +(The left side is supported as well, of course; just uncomment the assignment to PROMPT.) It looks a bit like this: .Customized `zsh` prompt. image::images/zsh-prompt.png[Customized `zsh` prompt.] +For more information on vcs_info, check out its documentation + in the `zshcontrib(1)` manual page, + or online at http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Version-Control-Information[]. + +Instead of vcs_info, you might prefer the prompt customization script that ships with Git, called `git-prompt.sh`; see http://git-prompt.sh[] for details. +`git-prompt.sh` is compatible with both Bash and Zsh. + Zsh is powerful enough that there are entire frameworks dedicated to making it better. One of them is called "oh-my-zsh", and it can be found at https://github.com/robbyrussell/oh-my-zsh[]. oh-my-zsh's plugin system comes with powerful git tab-completion, and it has a variety of prompt "themes", many of which display version-control data. diff --git a/book/B-embedding-git/callouts/1.png b/book/B-embedding-git/callouts/1.png old mode 100755 new mode 100644 index 7d473430..76af9244 Binary files a/book/B-embedding-git/callouts/1.png and b/book/B-embedding-git/callouts/1.png differ diff --git a/book/B-embedding-git/callouts/10.png b/book/B-embedding-git/callouts/10.png old mode 100755 new mode 100644 index 997bbc82..7377a831 Binary files a/book/B-embedding-git/callouts/10.png and b/book/B-embedding-git/callouts/10.png differ diff --git a/book/B-embedding-git/callouts/2.png b/book/B-embedding-git/callouts/2.png old mode 100755 new mode 100644 index 5d09341b..51ddd054 Binary files a/book/B-embedding-git/callouts/2.png and b/book/B-embedding-git/callouts/2.png differ diff --git a/book/B-embedding-git/callouts/3.png b/book/B-embedding-git/callouts/3.png old mode 100755 new mode 100644 index ef7b7004..3bda8523 Binary files a/book/B-embedding-git/callouts/3.png and b/book/B-embedding-git/callouts/3.png differ diff --git a/book/B-embedding-git/callouts/4.png b/book/B-embedding-git/callouts/4.png old mode 100755 new mode 100644 index adb8364e..4ff2806f Binary files a/book/B-embedding-git/callouts/4.png and b/book/B-embedding-git/callouts/4.png differ diff --git a/book/B-embedding-git/callouts/5.png b/book/B-embedding-git/callouts/5.png old mode 100755 new mode 100644 index 4d7eb460..bfc4b608 Binary files a/book/B-embedding-git/callouts/5.png and b/book/B-embedding-git/callouts/5.png differ diff --git a/book/B-embedding-git/callouts/6.png b/book/B-embedding-git/callouts/6.png old mode 100755 new mode 100644 index 0ba694af..67d3f27f Binary files a/book/B-embedding-git/callouts/6.png and b/book/B-embedding-git/callouts/6.png differ diff --git a/book/B-embedding-git/callouts/7.png b/book/B-embedding-git/callouts/7.png old mode 100755 new mode 100644 index 472e96f8..9a11f7a3 Binary files a/book/B-embedding-git/callouts/7.png and b/book/B-embedding-git/callouts/7.png differ diff --git a/book/B-embedding-git/callouts/8.png b/book/B-embedding-git/callouts/8.png old mode 100755 new mode 100644 index 5e60973c..fef709e6 Binary files a/book/B-embedding-git/callouts/8.png and b/book/B-embedding-git/callouts/8.png differ diff --git a/book/B-embedding-git/callouts/9.png b/book/B-embedding-git/callouts/9.png old mode 100755 new mode 100644 index a0676d26..9f4063dc Binary files a/book/B-embedding-git/callouts/9.png and b/book/B-embedding-git/callouts/9.png differ diff --git a/book/cover.png b/book/cover.png index 4dc57166..878b3f03 100644 Binary files a/book/cover.png and b/book/cover.png differ diff --git a/callouts/1.png b/callouts/1.png old mode 100755 new mode 100644 index 7d473430..76af9244 Binary files a/callouts/1.png and b/callouts/1.png differ diff --git a/callouts/10.png b/callouts/10.png old mode 100755 new mode 100644 index 997bbc82..7377a831 Binary files a/callouts/10.png and b/callouts/10.png differ diff --git a/callouts/2.png b/callouts/2.png old mode 100755 new mode 100644 index 5d09341b..51ddd054 Binary files a/callouts/2.png and b/callouts/2.png differ diff --git a/callouts/3.png b/callouts/3.png old mode 100755 new mode 100644 index ef7b7004..3bda8523 Binary files a/callouts/3.png and b/callouts/3.png differ diff --git a/callouts/4.png b/callouts/4.png old mode 100755 new mode 100644 index adb8364e..4ff2806f Binary files a/callouts/4.png and b/callouts/4.png differ diff --git a/callouts/5.png b/callouts/5.png old mode 100755 new mode 100644 index 4d7eb460..bfc4b608 Binary files a/callouts/5.png and b/callouts/5.png differ diff --git a/callouts/6.png b/callouts/6.png old mode 100755 new mode 100644 index 0ba694af..67d3f27f Binary files a/callouts/6.png and b/callouts/6.png differ diff --git a/callouts/7.png b/callouts/7.png old mode 100755 new mode 100644 index 472e96f8..9a11f7a3 Binary files a/callouts/7.png and b/callouts/7.png differ diff --git a/callouts/8.png b/callouts/8.png old mode 100755 new mode 100644 index 5e60973c..fef709e6 Binary files a/callouts/8.png and b/callouts/8.png differ diff --git a/callouts/9.png b/callouts/9.png old mode 100755 new mode 100644 index a0676d26..9f4063dc Binary files a/callouts/9.png and b/callouts/9.png differ