@@ -44,7 +44,7 @@ out without requiring internet access::
44
44
45
45
HEAD is now at f9a0d54099 Fix a slow doctest in matrix_integer_dense_hnf.py
46
46
47
- If it is not stored in your local git repository, you need to download
47
+ If it is not stored in your local Git repository, you need to download
48
48
it from the ``upstream `` repo first::
49
49
50
50
[alice@localhost sage]$ git fetch upstream f9a0d54099d758ccec731a38929902b2b9d0b988
@@ -173,9 +173,9 @@ Why not merging the other way round?
173
173
Being on some new SageMath (e.g. on branch ``develop ``) which runs
174
174
successfully, it would be possible to merge in our branch
175
175
``some_code `` into develop. This would produce the same source files
176
- and avoid unnecessary recompilations. However, it makes reading git 's
176
+ and avoid unnecessary recompilations. However, it makes reading Git 's
177
177
history very unpleasant: For example, it is hard to keep track of changes etc.,
178
- as one cannot simply pursue the first parent of each git commit
178
+ as one cannot simply pursue the first parent of each Git commit
179
179
(``git log --first-parent ``).
180
180
181
181
@@ -214,13 +214,13 @@ which is some 40-digit hexadecimal number (the SHA1 hash). Then use
214
214
215
215
Any *uncommitted * changes will be lost!
216
216
217
- You only need to type the first couple of hex digits, git will
217
+ You only need to type the first couple of hex digits, Git will
218
218
complain if this does not uniquely specify a commit. Also, there is
219
219
the useful abbreviation ``HEAD~ `` for the previous commit and
220
220
``HEAD~n ``, with some integer ``n ``, for the n-th previous commit.
221
221
222
222
Finally, perhaps the ultimate human error recovery tool is the
223
- reflog. This is a chronological history of git operations that you can
223
+ reflog. This is a chronological history of Git operations that you can
224
224
undo if needed. For example, let us assume we messed up the *git
225
225
reset * command and went back too far (say, 5 commits back). And, on
226
226
top of that, deleted a file and committed that::
@@ -239,14 +239,13 @@ because it is no longer in the history. However, here is the reflog::
239
239
1142feb HEAD@{3}: checkout: moving from other_branch to some_branch
240
240
...
241
241
242
- The ``HEAD@{n} `` revisions are shortcuts for the history of git
242
+ The ``HEAD@{n} `` revisions are shortcuts for the history of Git
243
243
operations. Since we want to rewind to before the erroneous *git
244
244
reset * command, we just have to reset back into the future::
245
245
246
246
[alice@localhost sage]$ git reset --hard HEAD@{2}
247
247
248
248
249
-
250
249
.. _section-git-rewriting-history :
251
250
252
251
Rewriting history
0 commit comments