Skip to content

Commit fff01d7

Browse files
committed
Replace git to Git
1 parent a580592 commit fff01d7

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/doc/en/developer/git_advanced.rst

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ out without requiring internet access::
4444

4545
HEAD is now at f9a0d54099 Fix a slow doctest in matrix_integer_dense_hnf.py
4646

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
4848
it from the ``upstream`` repo first::
4949

5050
[alice@localhost sage]$ git fetch upstream f9a0d54099d758ccec731a38929902b2b9d0b988
@@ -173,9 +173,9 @@ Why not merging the other way round?
173173
Being on some new SageMath (e.g. on branch ``develop``) which runs
174174
successfully, it would be possible to merge in our branch
175175
``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
177177
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
179179
(``git log --first-parent``).
180180

181181

@@ -214,13 +214,13 @@ which is some 40-digit hexadecimal number (the SHA1 hash). Then use
214214

215215
Any *uncommitted* changes will be lost!
216216

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
218218
complain if this does not uniquely specify a commit. Also, there is
219219
the useful abbreviation ``HEAD~`` for the previous commit and
220220
``HEAD~n``, with some integer ``n``, for the n-th previous commit.
221221

222222
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
224224
undo if needed. For example, let us assume we messed up the *git
225225
reset* command and went back too far (say, 5 commits back). And, on
226226
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::
239239
1142feb HEAD@{3}: checkout: moving from other_branch to some_branch
240240
...
241241

242-
The ``HEAD@{n}`` revisions are shortcuts for the history of git
242+
The ``HEAD@{n}`` revisions are shortcuts for the history of Git
243243
operations. Since we want to rewind to before the erroneous *git
244244
reset* command, we just have to reset back into the future::
245245

246246
[alice@localhost sage]$ git reset --hard HEAD@{2}
247247

248248

249-
250249
.. _section-git-rewriting-history:
251250

252251
Rewriting history

0 commit comments

Comments
 (0)