Skip to content

Commit b99984f

Browse files
authored
Merge pull request #1516 from Morganov/small-fixes
2 parents 1bd697e + c4f9122 commit b99984f

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

book/03-git-branching/sections/branch-management.asc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ Now you have a few more tasks in front of you to complete the transition:
177177
* Close or merge any pull requests that target the old branch.
178178

179179
After you've done all these tasks, and are certain the main branch performs just as the _master_ branch, you can delete the _master_ branch:
180+
180181
[source, console]
181182
----
182183
$ git push origin --delete master

book/07-git-tools/sections/rewriting-history.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ Each time, Git will stop, let you amend the commit, and continue when you're fin
172172
==== Reordering Commits
173173

174174
You can also use interactive rebases to reorder or remove commits entirely.
175-
If you want to remove the ``added cat-file'' commit and change the order in which the other two commits are introduced, you can change the rebase script from this:
175+
If you want to remove the ``Add cat-file'' commit and change the order in which the other two commits are introduced, you can change the rebase script from this:
176176

177177
[source,console]
178178
----
@@ -190,7 +190,7 @@ pick f7f3f6d Change my name a bit
190190
----
191191

192192
When you save and exit the editor, Git rewinds your branch to the parent of these commits, applies `310154e` and then `f7f3f6d`, and then stops.
193-
You effectively change the order of those commits and remove the ``added cat-file'' commit completely.
193+
You effectively change the order of those commits and remove the ``Add cat-file'' commit completely.
194194

195195
[[_squashing]]
196196
==== Squashing Commits

0 commit comments

Comments
 (0)