@@ -51,7 +51,7 @@ You have to keep it, because people can tell you that they liked
51
51
better what your previous version did, and because some people are
52
52
actually interested in the real history of your code.
53
53
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
55
55
and it is not easy to push or pull. You could also dig an email from
56
56
your sent-mail folder or a mailing list archive.
57
57
@@ -61,7 +61,7 @@ but we need more than that, we need the history of history.
61
61
` git submodule ` could be used to track that but people generally have
62
62
a bad experience with ` git submodule ` . It's also possible to manage
63
63
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
65
65
Git.
66
66
67
67
Another possibility is to use branches with version names like
@@ -85,7 +85,7 @@ rebasing stacks of patches sitting on top of upstream code.
85
85
the history of a patch series, and also tracks its cover letter and its
86
86
base.
87
87
88
- Then josh gave a demo.
88
+ Then Josh gave a demo.
89
89
90
90
To create a series called "feature" based on v4.7, you would run for
91
91
example:
@@ -184,14 +184,14 @@ git-series.
184
184
185
185
He found on multiple occasions that avoiding to need big errors
186
186
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
188
188
error impossible.
189
189
190
190
One example of that is what happens when we detach from a series or
191
191
check out a new series with uncommited changes. First he had designed
192
192
git-series to use only one staged and working version for a
193
193
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
195
195
` git series checkout --force ` to checkout anyway.
196
196
197
197
Then he realized that if each series had its own working and staged
@@ -361,4 +361,4 @@ __Git tools and sites__
361
361
## Credits
362
362
363
363
This edition of Git Rev News was curated by Christian Couder
< ; <
[email protected] >
> ; and
364
- Thomas Ferris Nicolaisen
< ; < [email protected] > > ; , with help from Brian M. Carlson.
364
+ Thomas Ferris Nicolaisen
< ; < [email protected] > > ; , with help from Brian M. Carlson
and Josh Triplett .
0 commit comments