diff --git a/src/doc/en/developer/git_setup.rst b/src/doc/en/developer/git_setup.rst index 8640bef4d4a..a66ff0b6df1 100644 --- a/src/doc/en/developer/git_setup.rst +++ b/src/doc/en/developer/git_setup.rst @@ -4,21 +4,13 @@ Setting Up Git ============== -To work on the Sage source code, you need a working Git installation, -configured at least to use your name and email address for commits. - -For further information about Git, see :ref:`chapter-git-background`, but this -is not required for a beginning Sage developer. - .. _section-git-install: Installing Git -------------- -First, try Git on the command line by typing ``git``. Most platforms will have it installed by -default if other development tools are installed. If that fails, use the -following to install Git: +Depending on your platform, use the following to install Git: Debian / Ubuntu Run ``sudo apt-get install git-core`` @@ -54,11 +46,7 @@ Some further resources for installation help are: Configuring Git --------------- -The commit message of any change contains your name and email address to -acknowledge your contribution and to have a point of contact if there are -questions in the future. Filling it in is required if you want to share your -changes. The simplest way to do this is from the command line. Assuming your -name ``alice`` and email address ``alice@wonderland.com``, +Assuming your name ``alice`` and email address ``alice@wonderland.com``, .. CODE-BLOCK:: shell-session @@ -77,3 +65,6 @@ This will write the settings into your :ref:`Git configuration file Of course, replace ``Alice Adventure`` and ``alice@wonderland.com`` with your actual name and email address. +This is the basic Git configuration for now. For further tips on configuring +Git, see :ref:`section-git-configuration`. + diff --git a/src/doc/en/developer/walkthrough.rst b/src/doc/en/developer/walkthrough.rst index 4984101c91b..881dc74c8c0 100644 --- a/src/doc/en/developer/walkthrough.rst +++ b/src/doc/en/developer/walkthrough.rst @@ -40,7 +40,7 @@ Don't worry about the giant list of subcommands. You really only need a handful of them for effective development, and we will walk you through them in this guide. If you got a "command not found" error, then you don't have Git installed; now is the time to install it. See -:ref:`chapter-git-setup` for instructions. +:ref:`section-git-install` for instructions. Because we also track who does what changes with Git, you must tell Git how you want to be known. Check if Git knows you::