You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: book/05-distributed-git/sections/contributing.asc
+4-4Lines changed: 4 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -87,7 +87,7 @@ Further paragraphs come after blank lines.
87
87
If all your commit messages look like this, things will be a lot easier for you and the developers you work with.
88
88
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.
89
89
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`.
91
91
Do as we say, not as we do.
92
92
93
93
[[_private_team]]
@@ -177,7 +177,7 @@ John has a reference to the changes Jessica pushed up, but he has to merge them
177
177
[source,console]
178
178
----
179
179
$ git merge origin/master
180
-
Merge made by recursive.
180
+
Merge made by the 'recursive' strategy.
181
181
TODO | 1 +
182
182
1 files changed, 1 insertions(+), 0 deletions(-)
183
183
----
@@ -276,7 +276,7 @@ Now Jessica merges in John's work (`origin/master`):
276
276
----
277
277
$ git merge origin/master
278
278
Auto-merging lib/simplegit.rb
279
-
Merge made by recursive.
279
+
Merge made by the 'recursive' strategy.
280
280
lib/simplegit.rb | 2 +-
281
281
1 files changed, 1 insertions(+), 1 deletions(-)
282
282
----
@@ -394,7 +394,7 @@ Jessica can now merge this into the work she did with `git merge`:
0 commit comments