Skip to content

Commit 2966364

Browse files
author
Kaartic Sivaraam
committed
improved a few sentences
Changed a sentence that didn't seem well. Also changed the output messages of git to be consistent with that shown by git in real time
1 parent f145665 commit 2966364

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

book/05-distributed-git/sections/contributing.asc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Further paragraphs come after blank lines.
8787
If all your commit messages look like this, things will be a lot easier for you and the developers you work with.
8888
The Git project has well-formatted commit messages – try running `git log --no-merges` there to see what a nicely formatted project-commit history looks like.
8989

90-
In the following examples, and throughout most of this book, for the sake of brevity this book doesn't have nicely-formatted messages like this; instead, we use the `-m` option to `git commit`.
90+
For the sake of brevity, the following examples, and most examples in other parts of this book, don't have nicely-formatted messages like this; instead, we use the `-m` option to `git commit`.
9191
Do as we say, not as we do.
9292

9393
[[_private_team]]
@@ -177,7 +177,7 @@ John has a reference to the changes Jessica pushed up, but he has to merge them
177177
[source,console]
178178
----
179179
$ git merge origin/master
180-
Merge made by recursive.
180+
Merge made by the 'recursive' strategy.
181181
TODO | 1 +
182182
1 files changed, 1 insertions(+), 0 deletions(-)
183183
----
@@ -276,7 +276,7 @@ Now Jessica merges in John's work (`origin/master`):
276276
----
277277
$ git merge origin/master
278278
Auto-merging lib/simplegit.rb
279-
Merge made by recursive.
279+
Merge made by the 'recursive' strategy.
280280
lib/simplegit.rb | 2 +-
281281
1 files changed, 1 insertions(+), 1 deletions(-)
282282
----
@@ -394,7 +394,7 @@ Jessica can now merge this into the work she did with `git merge`:
394394
----
395395
$ git merge origin/featureBee
396396
Auto-merging lib/simplegit.rb
397-
Merge made by recursive.
397+
Merge made by the 'recursive' strategy.
398398
lib/simplegit.rb | 4 ++++
399399
1 files changed, 4 insertions(+), 0 deletions(-)
400400
----

0 commit comments

Comments
 (0)