X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-git.txt;h=c123c389a0105284c043935ec8667f6e7f72eb64;hb=90bba115aceff9a9ca34c024c418c821320e6c9f;hp=a4b957b8378456b509817aab80b7bcdfd14ea676;hpb=28dd482cd7806835c7f6662bcc3f32cee9d7e0b7;p=git-wiki.git
diff --git a/pep-git.txt b/pep-git.txt
index a4b957b..c123c38 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -75,19 +75,25 @@ Download and installation
Unix users: download and install using your package manager.
Microsoft Windows: download `git-for-windows
-`_.
+`_ or `msysGit
+`_.
MacOS X: use git installed with `XCode
-`_ or download
+`_ or download from
+`MacPorts `_ or
`git-osx-installer
-`_.
+`_ or
+install git with `Homebrew `_: ``brew install git``.
+
+`Atlassins's SourceTree `_ is a free
+Git and Mercurial GUI client for Windows or Mac.
Initial configuration
---------------------
This simple code is often appears in documentation, but it is
important so let repeat it here. Git marks every commit with author
-and commiter names/emails, so configure your real name and preferred
+and committer names/emails, so configure your real name and preferred
email::
$ git config --global user.name "User Name"
@@ -101,13 +107,25 @@ Examples of git commands in this PEP use the following approach. It is
supposed that you, the user, works with a local repository named
``python`` that has an upstream remote repo named ``origin``. Your
local repo has two branches ``v1`` and ``v2``. For most examples the
-currently checked out branch is ``v2``. That is, it's assumed you did
-something like that::
+currently checked out branch is ``v2``. That is, it's assumed you have
+done something like that::
+
+ $ git clone -b v2 http://git.python.org/python.git
+ $ cd python
+ $ git branch v1 origin/v1
+
+The last command creates a new local branch v1 and sets
+remotes/origin/v1 as its upstream remote branch.
+
+The same result can achieved with commands::
$ git clone -b v1 http://git.python.org/python.git
$ cd python
- $ git fetch origin v2:v2
- $ git checkout -b v2
+ $ git checkout --track origin/v2
+
+The last command creates a new local branch v2, sets
+remotes/origin/v2 as its upstream remote branch and checks it out into
+the working directory.
Branches and branches
@@ -146,10 +164,10 @@ To see local and remote branches (and tags) pointing to commits::
$ git log --decorate
You never do your own development on remote branches. You create a
-local branch that has a remote branch as an upstream and do
-development on that local branch. On push git updates remote branches,
-and on pull git updates remote branches and fast-forwards, merges or
-rebases local branches.
+local branch that has a remote branch as upstream and do development
+on that local branch. On push git updates remote branches, and on pull
+git updates remote branches and fast-forwards, merges or rebases local
+branches.
When you do an initial clone like this::
@@ -185,7 +203,7 @@ branch BRANCH and its upstream remote branch. But it refuses to update
branches in case of non-fast-forward. And it refuses to update the
current branch.
-The first command is used internall by ``git pull``.
+The first command is used internally by ``git pull``.
::
@@ -290,7 +308,7 @@ Commit editing and caveats
==========================
A warning not to edit published (pushed) commits also appears in
-documentation but it's also repeated here as it's very important.
+documentation but it's repeated here anyway as it's very important.
It is possible to recover from forced push but it's PITA for the
entire team. Please avoid it.
@@ -325,7 +343,7 @@ safely edit, remove, reorder, combine and split commits that hasn't
been pushed yet. You can even push commits to your own (backup) repo,
edit them later and force-push edited commits to replace what has
already been pushed. Not a problem until commits are in a public
-repository.
+or shared repository.
Undo