Skip to content

Reorganize git commands #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ezio-melotti merged 7 commits into from
Sep 7, 2017
Merged

Reorganize git commands #263

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c5b768e
Move the minimal configuration instructions.
ezio-melotti Sep 5, 2017
c507009
Move the remote configuration instructions.
ezio-melotti Sep 5, 2017
cafd72b
Move the pushing changes and synching remotes sections.
ezio-melotti Sep 6, 2017
055d155
First cleanup pass.
ezio-melotti Sep 6, 2017
ae26a03
Remove the "Maintaining a repository" section.
ezio-melotti Sep 6, 2017
b4153d1
Move the "Reverting a Merged Pull Request" section under "Working wit…
ezio-melotti Sep 6, 2017
a3c6133
Fix incorrect markup.
ezio-melotti Sep 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
First cleanup pass.
  • Loading branch information
@ezio-melotti
ezio-melotti committed Sep 7, 2017
commit 055d15579d1015e7220b3f823f01a1348c338b57
14 changes: 0 additions & 14 deletions committing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,11 +313,6 @@ into a state you aren't happy with.
.. _Git: https://git-scm.com/



Remotes Setup
-------------


.. _committing-active-branches:

Active branches
Expand Down Expand Up @@ -358,15 +353,6 @@ Developers can apply labels to GitHub pull requests).
.. _cherry_picker.py: https://github.com/python/core-workflow/tree/master/cherry_picker


.. _forking:

Forking repository

@ezio-melotti ezio-melotti Sep 6, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already in the bootcamp (and somewhere else too).

------------------

Forking a repository on GitHub is as simple as clicking Fork button in the right
upper corner at https://github.com/python/cpython.


Maintaining a repository

@ezio-melotti ezio-melotti Sep 6, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After asking around during the sprint, the consensus was to remove this section.

------------------------

Expand Down
7 changes: 4 additions & 3 deletions setup.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@ installation directions. You may also want to consider a graphical client
such as `TortoiseGit <https://tortoisegit.org/>`_ or
`GitHub Desktop <https://desktop.github.com/>`_.

You may also wish to :ref:`set up your name and email <set-up-name-email>` and
`an SSH key <https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/>`_
You may also wish to set up :ref:`your name and email <set-up-name-email>`
and `an SSH key
<https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/>`_
as this will allow you to interact with GitHub without typing a username
and password each time you execute a command, such as ``git pull``,
``git push``, or ``git fetch``. On Windows, you should also
:ref:`enable autocrlf on Windows <autocrlf>`.
:ref:`enable autocrlf <autocrlf>`.

@willingc willingc Sep 6, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIce! 👍


.. _checkout:

Expand Down