Skip to content

Commit 644fd17

Browse files
committed
Some moving around
1 parent 8467946 commit 644fd17

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

src/doc/en/developer/git_basic.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
Git Basics
77
==========
88

9+
Git is a tool to exchange commits (file changes) and branches (organized of
10+
commits) with other developers.
11+
12+
As a distributed revision control system, Git does not have the notion of a
13+
central server. However, for Sage development, Git communicates with other
14+
developers via `the Sage repository <https://github.com/sagemath/sage>`_ on
15+
GitHub. Hence we assume that throughout this guide.
916

1017
.. _section-git-ssh:
1118

src/doc/en/developer/index.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,8 @@ First Steps
9494
.. toctree::
9595
:maxdepth: 2
9696

97-
git_setup
9897
walkthrough
99-
98+
git_setup
10099

101100
.. _section-development-on-github:
102101

src/doc/en/developer/walkthrough.rst

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,11 @@ This section is a concise overview of the Sage development process. We will see
1010
how to make changes to the Sage source code and record them in the Git revision
1111
control system.
1212

13-
We also have a handy `one-page cheat sheet
14-
<http://github.com/sagemath/git-trac-command/raw/master/doc/git-cheat-sheet.pdf>`_
15-
of commonly used git commands that you can print out and leave on your
16-
desk. We have some :ref:`recommended references and tutorials
17-
<section-git-tutorials>` as well.
18-
1913
In the sections of the following chapter :ref:`section-development-on-github`,
2014
we will look at communicating these changes back to the Sage project. All
2115
changes to Sage source code have to go through `the Sage repository
2216
<https://github.com/sagemath/sage>`_ on GitHub.
2317

24-
Git is a tool to exchange commits (organized into branches) with other
25-
developers. As a distributed revision control system, it does not have the
26-
notion of a central server. `The Sage repository
27-
<https://github.com/sagemath/sage>`_ on GitHub is just one of many possible
28-
remote repositories from your (or rather your Git) point of view.
29-
3018
For examples, we assume your name Alice. Always replace it with your own name.
3119

3220
.. _section-walkthrough-setup-git:
@@ -234,7 +222,7 @@ to rebuild the Sage library and then start Sage.
234222

235223
All changes to Python files take effect immediately after restarting Sage
236224
(unless you have used ``./configure --disable-editable`` when you built
237-
Sage). Hence you just start Sage instead of ``./sage -br`` if only Python
225+
Sage). Hence you can just start Sage instead of ``./sage -br`` if only Python
238226
files were modified.
239227

240228
If you made changes to :ref:`third-party packages <chapter-packaging>`

0 commit comments

Comments
 (0)