Skip to content

Commit c4679f0

Browse files
committed
Merge pull request #93 from schacon/cleanup
Cleanup
2 parents 60fbc99 + 1e63da4 commit c4679f0

File tree

7 files changed

+41
-23
lines changed

7 files changed

+41
-23
lines changed

book/01-introduction/sections/basics.asc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ The mechanism that Git uses for this checksumming is called a SHA-1 hash.(((SHA-
5656
This is a 40-character string composed of hexadecimal characters (0–9 and a–f) and calculated based on the contents of a file or directory structure in Git.
5757
A SHA-1 hash looks something like this:
5858

59-
24b9da6552252987aa493b52f8696cd6d3b00373
59+
[source]
60+
----
61+
24b9da6552252987aa493b52f8696cd6d3b00373
62+
----
6063

6164
You will see these hash values all over the place in Git because it uses them so much.
6265
In fact, Git stores everything in its database not by file name but by the hash value of its contents.

book/01-introduction/sections/first-time-setup.asc

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@ It also still looks for `/etc/gitconfig`, although it's relative to the MSys roo
2424
The first thing you should do when you install Git is to set your user name and e-mail address.
2525
This is important because every Git commit uses this information, and it's immutably baked into the commits you start creating:
2626

27-
$ git config --global user.name "John Doe"
28-
$ git config --global user.email [email protected]
27+
[source,console]
28+
----
29+
$ git config --global user.name "John Doe"
30+
$ git config --global user.email [email protected]
31+
----
2932

3033
Again, you need to do this only once if you pass the `--global` option, because then Git will always use that information for anything you do on that system.
3134
If you want to override this with a different name or e-mail address for specific projects, you can run the command without the `--global` option when you're in that project.
@@ -38,7 +41,10 @@ Now that your identity is set up, you can configure the default text editor that
3841
If not configured, Git uses your system's default editor, which is generally Vim.
3942
If you want to use a different text editor, such as Emacs, you can do the following:
4043

41-
$ git config --global core.editor emacs
44+
[source,console]
45+
----
46+
$ git config --global core.editor emacs
47+
----
4248

4349
[NOTE]
4450
====
@@ -49,19 +55,25 @@ Vim and Emacs are popular text editors often used by developers on Unix based sy
4955

5056
If you want to check your settings, you can use the `git config --list` command to list all the settings Git can find at that point:
5157

52-
$ git config --list
53-
user.name=John Doe
54-
55-
color.status=auto
56-
color.branch=auto
57-
color.interactive=auto
58-
color.diff=auto
59-
...
58+
[source,console]
59+
----
60+
$ git config --list
61+
user.name=John Doe
62+
63+
color.status=auto
64+
color.branch=auto
65+
color.interactive=auto
66+
color.diff=auto
67+
...
68+
----
6069

6170
You may see keys more than once, because Git reads the same key from different files (`/etc/gitconfig` and `~/.gitconfig`, for example).
6271
In this case, Git uses the last value for each unique key it sees.
6372

6473
You can also check what Git thinks a specific key's value is by typing `git config <key>`:(((git commands, config)))
6574

66-
$ git config user.name
67-
John Doe
75+
[source,console]
76+
----
77+
$ git config user.name
78+
John Doe
79+
----

book/01-introduction/sections/help.asc

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,19 @@
33

44
If you ever need help while using Git, there are three ways to get the manual page (manpage) help for any of the Git commands:
55

6-
$ git help <verb>
7-
$ git <verb> --help
8-
$ man git-<verb>
6+
[source,console]
7+
----
8+
$ git help <verb>
9+
$ git <verb> --help
10+
$ man git-<verb>
11+
----
912

1013
For example, you can get the manpage help for the config command by running(((git commands, help)))
1114

12-
$ git help config
15+
[source,console]
16+
----
17+
$ git help config
18+
----
1319

1420
These commands are nice because you can access them anywhere, even offline.
1521
If the manpages and this book aren't enough and you need in-person help, you can try the `#git` or `#github` channel on the Freenode IRC server (irc.freenode.net).

book/cover.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<figure data-type="cover"><img alt="cover" src="../images/cover.png" /></figure>
1+
<figure data-type="cover"><img alt="cover" src="cover.png" /></figure>
File renamed without changes.

progit.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Pro Git
44
:docinfo:
55
:toc:
66
:toclevels: 2
7-
:front-cover-image: image:cover.png[width=1050,height=1600]
7+
:front-cover-image: image:book/cover.png[width=1050,height=1600]
88

99
include::book/01-introduction/1-introduction.asc[]
1010

test.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)