Skip to content

Commit b1d5d7c

Browse files
committed
rn-19: fix typo in git-series article
1 parent 685b4a4 commit b1d5d7c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

rev_news/drafts/edition-19.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ You have to keep it, because people can tell you that they liked
5151
better what your previous version did, and because some people are
5252
actually interested in the real history of your code.
5353

54-
You could use the reflog to keep it, but it is effemeral by default
54+
You could use the reflog to keep it, but it is ephemeral by default
5555
and it is not easy to push or pull. You could also dig an email from
5656
your sent-mail folder or a mailing list archive.
5757

@@ -61,7 +61,7 @@ but we need more than that, we need the history of history.
6161
`git submodule` could be used to track that but people generally have
6262
a bad experience with `git submodule`. It's also possible to manage
6363
patches outside Git. There are tools like for example quilt that can
64-
be used for this purpose, but then you loose the power of working with
64+
be used for this purpose, but then you lose the power of working with
6565
Git.
6666

6767
Another possibility is to use branches with version names like
@@ -85,7 +85,7 @@ rebasing stacks of patches sitting on top of upstream code.
8585
the history of a patch series, and also tracks its cover letter and its
8686
base.
8787

88-
Then josh gave a demo.
88+
Then Josh gave a demo.
8989

9090
To create a series called "feature" based on v4.7, you would run for
9191
example:
@@ -184,14 +184,14 @@ git-series.
184184

185185
He found on multiple occasions that avoiding to need big errors
186186
messages was a good strategy. Often a long and complex error messages
187-
suggested he migth have a design flaw, so he redesigned to make the
187+
suggested he might have a design flaw, so he redesigned to make the
188188
error impossible.
189189

190190
One example of that is what happens when we detach from a series or
191191
check out a new series with uncommited changes. First he had designed
192192
git-series to use only one staged and working version for a
193193
repository, so in this case he would have needed an error message to
194-
explain that you could loose some data and perhaps something like
194+
explain that you could lose some data and perhaps something like
195195
`git series checkout --force` to checkout anyway.
196196

197197
Then he realized that if each series had its own working and staged
@@ -361,4 +361,4 @@ __Git tools and sites__
361361
## Credits
362362

363363
This edition of Git Rev News was curated by Christian Couder &lt;<[email protected]>&gt; and
364-
Thomas Ferris Nicolaisen &lt;<[email protected]>&gt;, with help from Brian M. Carlson.
364+
Thomas Ferris Nicolaisen &lt;<[email protected]>&gt;, with help from Brian M. Carlson and Josh Triplett.

0 commit comments

Comments
 (0)