Skip to content

Commit 345e4b3

Browse files
author
Vipul Kumar
committed
[Fix] remove period from text present in square bracket
There is no need for period mark at end of text, present in square bracket; and removing it also make syntax consistent across whole project.
1 parent b600691 commit 345e4b3

File tree

32 files changed

+117
-117
lines changed

32 files changed

+117
-117
lines changed

book/01-introduction/sections/installing.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ If you want a more up to date version, you can also install it via a binary inst
4949
A macOS Git installer is maintained and available for download at the Git website, at https://git-scm.com/download/mac[].
5050

5151
.Git macOS Installer
52-
image::images/git-osx-installer.png[Git macOS installer.]
52+
image::images/git-osx-installer.png[Git macOS installer]
5353

5454
You can also install it as part of the GitHub for macOS install.
5555
Their GUI Git tool has an option to install command line tools as well.

book/01-introduction/sections/what-is-git.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Conceptually, most other systems store information as a list of file-based chang
1212
These other systems (CVS, Subversion, Perforce, Bazaar, and so on) think of the information they store as a set of files and the changes made to each file over time (this is commonly described as _delta-based_ version control).
1313

1414
.Storing data as changes to a base version of each file
15-
image::images/deltas.png[Storing data as changes to a base version of each file.]
15+
image::images/deltas.png[Storing data as changes to a base version of each file]
1616

1717
Git doesn't think of or store its data this way.
1818
Instead, Git thinks of its data more like a series of snapshots of a miniature filesystem.
@@ -21,7 +21,7 @@ To be efficient, if files have not changed, Git doesn't store the file again, ju
2121
Git thinks about its data more like a *stream of snapshots*.
2222

2323
.Storing data as snapshots of the project over time
24-
image::images/snapshots.png[Git stores data as snapshots of the project over time.]
24+
image::images/snapshots.png[Git stores data as snapshots of the project over time]
2525

2626
This is an important distinction between Git and nearly all other VCSs.
2727
It makes Git reconsider almost every aspect of version control that most other systems copied from the previous generation.

book/02-git-basics/sections/recording-changes.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ As you edit files, Git sees them as modified, because you've changed them since
1414
As you work, you selectively stage these modified files and then commit all those staged changes, and the cycle repeats.
1515

1616
.The lifecycle of the status of your files
17-
image::images/lifecycle.png[The lifecycle of the status of your files.]
17+
image::images/lifecycle.png[The lifecycle of the status of your files]
1818

1919
[[_checking_status]]
2020
==== Checking the Status of Your Files

book/03-git-branching/sections/basic-branching-and-merging.asc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ You'll do the following:
2222
First, let's say you're working on your project and have a couple of commits already on the `master` branch.
2323

2424
.A simple commit history
25-
image::images/basic-branching-1.png[A simple commit history.]
25+
image::images/basic-branching-1.png[A simple commit history]
2626

2727
You've decided that you're going to work on issue #53 in whatever issue-tracking system your company uses.
2828
To create a new branch and switch to it at the same time, you can run the `git checkout` command with the `-b` switch:
@@ -42,7 +42,7 @@ $ git checkout iss53
4242
----
4343

4444
.Creating a new branch pointer
45-
image::images/basic-branching-2.png[Creating a new branch pointer.]
45+
image::images/basic-branching-2.png[Creating a new branch pointer]
4646

4747
You work on your website and do some commits.
4848
Doing so moves the `iss53` branch forward, because you have it checked out (that is, your `HEAD` is pointing to it):
@@ -54,7 +54,7 @@ $ git commit -a -m 'Create new footer [issue 53]'
5454
----
5555

5656
.The `iss53` branch has moved forward with your work
57-
image::images/basic-branching-3.png[The `iss53` branch has moved forward with your work.]
57+
image::images/basic-branching-3.png[The `iss53` branch has moved forward with your work]
5858

5959
Now you get the call that there is an issue with the website, and you need to fix it immediately.
6060
With Git, you don't have to deploy your fix along with the `iss53` changes you've made, and you don't have to put a lot of effort into reverting those changes before you can work on applying your fix to what is in production.
@@ -89,7 +89,7 @@ $ git commit -a -m 'Fix broken email address'
8989
----
9090

9191
.Hotfix branch based on `master`
92-
image::images/basic-branching-4.png[Hotfix branch based on `master`.]
92+
image::images/basic-branching-4.png[Hotfix branch based on `master`]
9393

9494
You can run your tests, make sure the hotfix is what you want, and finally merge the `hotfix` branch back into your `master` branch to deploy to production.
9595
You do this with the `git merge` command:(((git commands, merge)))
@@ -111,7 +111,7 @@ To phrase that another way, when you try to merge one commit with a commit that
111111
Your change is now in the snapshot of the commit pointed to by the `master` branch, and you can deploy the fix.
112112

113113
.`master` is fast-forwarded to `hotfix`
114-
image::images/basic-branching-5.png[`master` is fast-forwarded to `hotfix`.]
114+
image::images/basic-branching-5.png[`master` is fast-forwarded to `hotfix`]
115115

116116
After your super-important fix is deployed, you're ready to switch back to the work you were doing before you were interrupted.
117117
However, first you'll delete the `hotfix` branch, because you no longer need it -- the `master` branch points at the same place.
@@ -136,7 +136,7 @@ $ git commit -a -m 'Finish the new footer [issue 53]'
136136
----
137137

138138
.Work continues on `iss53`
139-
image::images/basic-branching-6.png[Work continues on `iss53`.]
139+
image::images/basic-branching-6.png[Work continues on `iss53`]
140140

141141
It's worth noting here that the work you did in your `hotfix` branch is not contained in the files in your `iss53` branch.
142142
If you need to pull it in, you can merge your `master` branch into your `iss53` branch by running `git merge master`, or you can wait to integrate those changes until you decide to pull the `iss53` branch back into `master` later.
@@ -165,13 +165,13 @@ Because the commit on the branch you're on isn't a direct ancestor of the branch
165165
In this case, Git does a simple three-way merge, using the two snapshots pointed to by the branch tips and the common ancestor of the two.
166166

167167
.Three snapshots used in a typical merge
168-
image::images/basic-merging-1.png[Three snapshots used in a typical merge.]
168+
image::images/basic-merging-1.png[Three snapshots used in a typical merge]
169169

170170
Instead of just moving the branch pointer forward, Git creates a new snapshot that results from this three-way merge and automatically creates a new commit that points to it.
171171
This is referred to as a merge commit, and is special in that it has more than one parent.
172172

173173
.A merge commit
174-
image::images/basic-merging-2.png[A merge commit.]
174+
image::images/basic-merging-2.png[A merge commit]
175175

176176
Now that your work is merged in, you have no further need for the `iss53` branch.
177177
You can close the issue in your issue-tracking system, and delete the branch:

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ Git then creates a commit object that has the metadata and a pointer to the root
2323
Your Git repository now contains five objects: three _blobs_ (each representing the contents of one of the three files), one _tree_ that lists the contents of the directory and specifies which file names are stored as which blobs, and one _commit_ with the pointer to that root tree and all the commit metadata.
2424

2525
.A commit and its tree
26-
image::images/commit-and-tree.png[A commit and its tree.]
26+
image::images/commit-and-tree.png[A commit and its tree]
2727

2828
If you make some changes and commit again, the next commit stores a pointer to the commit that came immediately before it.
2929

3030
.Commits and their parents
31-
image::images/commits-and-parents.png[Commits and their parents.]
31+
image::images/commits-and-parents.png[Commits and their parents]
3232

3333
A branch in Git is simply a lightweight movable pointer to one of these commits.
3434
The default branch name in Git is `master`.
@@ -43,7 +43,7 @@ The only reason nearly every repository has one is that the `git init` command c
4343
====
4444

4545
.A branch and its commit history
46-
image::images/branch-and-history.png[A branch and its commit history.]
46+
image::images/branch-and-history.png[A branch and its commit history]
4747

4848
[[_create_new_branch]]
4949
==== Creating a New Branch
@@ -62,7 +62,7 @@ $ git branch testing
6262
This creates a new pointer to the same commit you're currently on.
6363

6464
.Two branches pointing into the same series of commits
65-
image::images/two-branches.png[Two branches pointing into the same series of commits.]
65+
image::images/two-branches.png[Two branches pointing into the same series of commits]
6666

6767
How does Git know what branch you're currently on?
6868
It keeps a special pointer called `HEAD`.
@@ -72,7 +72,7 @@ In this case, you're still on `master`.
7272
The `git branch` command only _created_ a new branch -- it didn't switch to that branch.
7373

7474
.HEAD pointing to a branch
75-
image::images/head-to-master.png[HEAD pointing to a branch.]
75+
image::images/head-to-master.png[HEAD pointing to a branch]
7676

7777
You can easily see this by running a simple `git log` command that shows you where the branch pointers are pointing.
7878
This option is called `--decorate`.
@@ -102,7 +102,7 @@ $ git checkout testing
102102
This moves `HEAD` to point to the `testing` branch.
103103

104104
.HEAD points to the current branch
105-
image::images/head-to-testing.png[HEAD points to the current branch.]
105+
image::images/head-to-testing.png[HEAD points to the current branch]
106106

107107
What is the significance of that?
108108
Well, let's do another commit:
@@ -114,7 +114,7 @@ $ git commit -a -m 'made a change'
114114
----
115115

116116
.The HEAD branch moves forward when a commit is made
117-
image::images/advance-testing.png[The HEAD branch moves forward when a commit is made.]
117+
image::images/advance-testing.png[The HEAD branch moves forward when a commit is made]
118118

119119
This is interesting, because now your `testing` branch has moved forward, but your `master` branch still points to the commit you were on when you ran `git checkout` to switch branches.
120120
Let's switch back to the `master` branch:
@@ -137,7 +137,7 @@ To show all of the branches, add `--all` to your `git log` command.
137137
====
138138

139139
.HEAD moves when you checkout
140-
image::images/checkout-master.png[HEAD moves when you checkout.]
140+
image::images/checkout-master.png[HEAD moves when you checkout]
141141

142142
That command did two things.
143143
It moved the HEAD pointer back to point to the `master` branch, and it reverted the files in your working directory back to the snapshot that `master` points to.
@@ -167,7 +167,7 @@ And you did all that with simple `branch`, `checkout`, and `commit` commands.
167167

168168
[[divergent_history]]
169169
.Divergent history
170-
image::images/advance-master.png[Divergent history.]
170+
image::images/advance-master.png[Divergent history]
171171

172172
You can also see this easily with the `git log` command.
173173
If you run `git log --oneline --decorate --graph --all` it will print out the history of your commits, showing where your branch pointers are and how your history has diverged.

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ In this section you'll learn what rebasing is, how to do it, why it's a pretty a
1010
If you go back to an earlier example from <<_basic_merging>>, you can see that you diverged your work and made commits on two different branches.
1111

1212
.Simple divergent history
13-
image::images/basic-rebase-1.png[Simple divergent history.]
13+
image::images/basic-rebase-1.png[Simple divergent history]
1414

1515
The easiest way to integrate the branches, as we've already covered, is the `merge` command.
1616
It performs a three-way merge between the two latest branch snapshots (`C3` and `C4`) and the most recent common ancestor of the two (`C2`), creating a new snapshot (and commit).
1717

1818
[[rebasing-merging-example]]
1919
.Merging to integrate diverged work history
20-
image::images/basic-rebase-2.png[Merging to integrate diverged work history.]
20+
image::images/basic-rebase-2.png[Merging to integrate diverged work history]
2121

2222
However, there is another way: you can take the patch of the change that was introduced in `C4` and reapply it on top of `C3`.
2323
In Git, this is called _rebasing_.
@@ -36,7 +36,7 @@ Applying: added staged command
3636
This operation works by going to the common ancestor of the two branches (the one you're on and the one you're rebasing onto), getting the diff introduced by each commit of the branch you're on, saving those diffs to temporary files, resetting the current branch to the same commit as the branch you are rebasing onto, and finally applying each change in turn.
3737

3838
.Rebasing the change introduced in `C4` onto `C3`
39-
image::images/basic-rebase-3.png[Rebasing the change introduced in `C4` onto `C3`.]
39+
image::images/basic-rebase-3.png[Rebasing the change introduced in `C4` onto `C3`]
4040

4141
At this point, you can go back to the `master` branch and do a fast-forward merge.
4242

@@ -47,7 +47,7 @@ $ git merge experiment
4747
----
4848

4949
.Fast-forwarding the `master` branch
50-
image::images/basic-rebase-4.png[Fast-forwarding the `master` branch.]
50+
image::images/basic-rebase-4.png[Fast-forwarding the `master` branch]
5151

5252
Now, the snapshot pointed to by `C4'` is exactly the same as the one that was pointed to by `C5` in <<rebasing-merging-example,the merge example>>.
5353
There is no difference in the end product of the integration, but rebasing makes for a cleaner history.
@@ -70,7 +70,7 @@ Finally, you went back to your server branch and did a few more commits.
7070

7171
[[rbdiag_e]]
7272
.A history with a topic branch off another topic branch
73-
image::images/interesting-rebase-1.png[A history with a topic branch off another topic branch.]
73+
image::images/interesting-rebase-1.png[A history with a topic branch off another topic branch]
7474

7575
Suppose you decide that you want to merge your client-side changes into your mainline for a release, but you want to hold off on the server-side changes until it's tested further.
7676
You can take the changes on `client` that aren't on `server` (`C8` and `C9`) and replay them on your `master` branch by using the `--onto` option of `git rebase`:
@@ -84,7 +84,7 @@ This basically says, ``Take the `client` branch, figure out the patches since it
8484
It's a bit complex, but the result is pretty cool.
8585

8686
.Rebasing a topic branch off another topic branch
87-
image::images/interesting-rebase-2.png[Rebasing a topic branch off another topic branch.]
87+
image::images/interesting-rebase-2.png[Rebasing a topic branch off another topic branch]
8888

8989
Now you can fast-forward your `master` branch (see <<rbdiag_g>>):
9090

@@ -96,7 +96,7 @@ $ git merge client
9696

9797
[[rbdiag_g]]
9898
.Fast-forwarding your `master` branch to include the client branch changes
99-
image::images/interesting-rebase-3.png[Fast-forwarding your `master` branch to include the client branch changes.]
99+
image::images/interesting-rebase-3.png[Fast-forwarding your `master` branch to include the client branch changes]
100100

101101
Let's say you decide to pull in your server branch as well.
102102
You can rebase the `server` branch onto the `master` branch without having to check it out first by running `git rebase <basebranch> <topicbranch>` -- which checks out the topic branch (in this case, `server`) for you and replays it onto the base branch (`master`):
@@ -110,7 +110,7 @@ This replays your `server` work on top of your `master` work, as shown in <<rbdi
110110

111111
[[rbdiag_h]]
112112
.Rebasing your server branch on top of your `master` branch
113-
image::images/interesting-rebase-4.png[Rebasing your server branch on top of your `master` branch.]
113+
image::images/interesting-rebase-4.png[Rebasing your server branch on top of your `master` branch]
114114

115115
Then, you can fast-forward the base branch (`master`):
116116

@@ -130,7 +130,7 @@ $ git branch -d server
130130

131131
[[rbdiag_i]]
132132
.Final commit history
133-
image::images/interesting-rebase-5.png[Final commit history.]
133+
image::images/interesting-rebase-5.png[Final commit history]
134134

135135
[[_rebase_peril]]
136136
==== The Perils of Rebasing
@@ -171,7 +171,7 @@ If you do a `git pull`, you'll create a merge commit which includes both lines o
171171

172172
[[_merge_rebase_work]]
173173
.You merge in the same work again into a new merge commit
174-
image::images/perils-of-rebasing-4.png[You merge in the same work again into a new merge commit.]
174+
image::images/perils-of-rebasing-4.png[You merge in the same work again into a new merge commit]
175175

176176
If you run a `git log` when your history looks like this, you'll see two commits that have the same author, date, and message, which will be confusing.
177177
Furthermore, if you push this history back up to the server, you'll reintroduce all those rebased commits to the central server, which can further confuse people.
@@ -199,7 +199,7 @@ So instead of the result we see in <<_merge_rebase_work>>, we would end up with
199199

200200
[[_rebase_rebase_work]]
201201
.Rebase on top of force-pushed rebase work
202-
image::images/perils-of-rebasing-5.png[Rebase on top of force-pushed rebase work.]
202+
image::images/perils-of-rebasing-5.png[Rebase on top of force-pushed rebase work]
203203

204204
This only works if `C4` and `C4'` that your partner made are almost exactly the same patch.
205205
Otherwise the rebase won't be able to tell that it's a duplicate and will add another C4-like patch (which will probably fail to apply cleanly, since the changes would already be at least somewhat there).

book/03-git-branching/sections/remote-branches.asc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,27 @@ If you do some work on your local `master` branch, and, in the meantime, someone
3434
Also, as long as you stay out of contact with your `origin` server, your `origin/master` pointer doesn't move.
3535

3636
.Local and remote work can diverge
37-
image::images/remote-branches-2.png[Local and remote work can diverge.]
37+
image::images/remote-branches-2.png[Local and remote work can diverge]
3838

3939
To synchronize your work with a given remote, you run a `git fetch <remote>` command (in our case, `git fetch origin`).
4040
This command looks up which server ``origin'' is (in this case, it's `git.ourcompany.com`), fetches any data from it that you don't yet have, and updates your local database, moving your `origin/master` pointer to its new, more up-to-date position.
4141

4242
.`git fetch` updates your remote-tracking branches
43-
image::images/remote-branches-3.png[`git fetch` updates your remote references.]
43+
image::images/remote-branches-3.png[`git fetch` updates your remote references]
4444

4545
To demonstrate having multiple remote servers and what remote branches for those remote projects look like, let's assume you have another internal Git server that is used only for development by one of your sprint teams.
4646
This server is at `git.team1.ourcompany.com`.
4747
You can add it as a new remote reference to the project you're currently working on by running the `git remote add` command as we covered in <<ch02-git-basics-chapter#ch02-git-basics-chapter>>.
4848
Name this remote `teamone`, which will be your shortname for that whole URL.
4949

5050
.Adding another server as a remote
51-
image::images/remote-branches-4.png[Adding another server as a remote.]
51+
image::images/remote-branches-4.png[Adding another server as a remote]
5252

5353
Now, you can run `git fetch teamone` to fetch everything the remote `teamone` server has that you don't have yet.
5454
Because that server has a subset of the data your `origin` server has right now, Git fetches no data but sets a remote-tracking branch called `teamone/master` to point to the commit that `teamone` has as its `master` branch.
5555

5656
.Remote-tracking branch for `teamone/master`
57-
image::images/remote-branches-5.png[Remote tracking branch for `teamone/master`.]
57+
image::images/remote-branches-5.png[Remote tracking branch for `teamone/master`]
5858

5959
[[_pushing_branches]]
6060
==== Pushing

0 commit comments

Comments
 (0)