Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
output
.DS_Store
41 changes: 41 additions & 0 deletions atlas.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"branch": "master",
"files": [
"book/cover.html",
"book/preface.asc",
"book/01-introduction/1-introduction.asc",
"book/02-git-basics/1-git-basics.asc",
"book/03-git-branching/1-git-branching.asc",
"book/04-git-server/1-git-server.asc",
"book/05-distributed-git/1-distributed-git.asc",
"book/06-github/1-github.asc",
"book/07-git-tools/1-git-tools.asc",
"book/08-customizing-git/1-customizing-git.asc",
"book/09-git-and-other-scms/1-git-and-other-scms.asc",
"book/10-git-in-other-environments/1-git-other-environments.asc",
"book/11-git-internals/1-git-internals.asc",
"book/index.asc"
],
"formats": {
"pdf": {
"version": "web",
"index": true,
"toc": true
},
"epub": {
"index": true,
"toc": true,
"epubcheck": false
},
"mobi": {
"index": true,
"toc": true
},
"html": {
"index": true,
"toc": true
}
},
"theme": "oreillymedia/pro-git-theme",
"title": "Pro Git"
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ At the end of this chapter you should understand why Git is around, why you shou

=== About Version Control (((version control)))

What is version control, and why should you care?
What is ((("version control"))), and why should you care?
Version control is a system that records changes to a file or set of files over time so that you can recall specific versions later.
For the examples in this book you will use software source code as the files being version controlled, though in reality you can do this with nearly any type of file on a computer.

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ This is a hub for performing Git actions; when you're _writing_ code, you'll pro

[[vs_home]]
.The "Home" view for a Git repository in Visual Studio.
image::images/vs-2.png[The "Home" view for a Git repository in Visual Studio.]
image::images/vs-2.png[The Home view for a Git repository in Visual Studio.]

Visual Studio now has a powerful task-focused UI for Git.
It includes a linear history view, a diff viewer, remote commands, and many other capabilities.
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
1 change: 1 addition & 0 deletions book/cover.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<figure data-type="cover"><img alt="cover" src="../images/cover.png" /></figure>
1 change: 1 addition & 0 deletions book/index.asc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
== Index
25 changes: 0 additions & 25 deletions en/book/book.asc → book/preface.asc
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,3 @@ I didn't much like that I was writing what I felt was essentially a community re
While I still don't love that conflict of interests, the importance of GitHub in the Git community is unavoidable.
Instead of an example of Git hosting, I have decided to turn that part of the book into more deeply describing what GitHub is and how to effectively use it.
If you are going to learn how to use Git then knowing how to use GitHub will help you take part in a huge community, which is valuable no matter which Git host you decide to use for your own code.

include::01-introduction/chapter1.asc[]

include::02-git-basics/chapter2.asc[]

include::03-git-branching/chapter3.asc[]

include::04-git-server/chapter4.asc[]

include::05-distributed-git/chapter5.asc[]

include::06-github/chapter6.asc[]

include::07-git-tools/chapter7.asc[]

include::08-customizing-git/chapter8.asc[]

include::09-git-and-other-scms/chapter9.asc[]

include::10-git-in-other-environments/chapter10.asc[]

include::11-git-internals/chapter11.asc[]

[index]
== Index
7 changes: 0 additions & 7 deletions en/.gitscribe

This file was deleted.

13 changes: 0 additions & 13 deletions en/book/book-docinfo.xml

This file was deleted.

Binary file removed en/book/images/cover.jpg
Diff not rendered.
Binary file added images/cover.png