Skip to content

Commit 3f6b8db

Browse files
Sanders Kleinfeldschacon
authored andcommitted
Putting image alt text that contains commas in quotes.
Conflicts: book/01-introduction/sections/basics.asc
1 parent 4773171 commit 3f6b8db

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

book/01-introduction/sections/basics.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Staged means that you have marked a modified file in its current version to go i
8585
This leads us to the three main sections of a Git project: the Git directory, the working directory, and the staging area.
8686

8787
.Working directory, staging area, and Git directory.
88-
image::images/areas.png[Working directory, staging area, and Git directory.]
88+
image::images/areas.png["Working directory, staging area, and Git directory."]
8989

9090
The Git directory is where Git stores the metadata and object database for your project.
9191
This is the most important part of Git, and it is what is copied when you clone a repository from another computer.

book/03-git-branching/sections/rebasing.asc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,20 +150,20 @@ Suppose you clone from a central server and then do some work off that.
150150
Your commit history looks like this:
151151

152152
.Clone a repository, and base some work on it
153-
image::images/perils-of-rebasing-1.png[Clone a repository, and base some work on it.]
153+
image::images/perils-of-rebasing-1.png["Clone a repository, and base some work on it."]
154154

155155
Now, someone else does more work that includes a merge, and pushes that work to the central server.
156156
You fetch them and merge the new remote branch into your work, making your history look something like this:
157157

158158
.Fetch more commits, and merge them into your work
159-
image::images/perils-of-rebasing-2.png[Fetch more commits, and merge them into your work.]
159+
image::images/perils-of-rebasing-2.png["Fetch more commits, and merge them into your work."]
160160

161161
Next, the person who pushed the merged work decides to go back and rebase their work instead; they do a `git push --force` to overwrite the history on the server.
162162
You then fetch from that server, bringing down the new commits.
163163

164164
[[_pre_merge_rebase_work]]
165165
.Someone pushes rebased commits, abandoning commits you've based your work on
166-
image::images/perils-of-rebasing-3.png[Someone pushes rebased commits, abandoning commits you've based your work on.]
166+
image::images/perils-of-rebasing-3.png["Someone pushes rebased commits, abandoning commits you've based your work on."]
167167

168168
Now you're both in a pickle.
169169
If you do a `git pull`, you'll create a merge commit which includes both lines of history, and your repository will look like this:

0 commit comments

Comments
 (0)