From b55f73c29a2e0ebe88ca2d4f5adea3118c6423e4 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Mon, 1 Jun 2015 18:02:00 +0300 Subject: [PATCH] Add more details --- pep-git.txt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pep-git.txt b/pep-git.txt index 0d33a63..1b0f384 100644 --- a/pep-git.txt +++ b/pep-git.txt @@ -91,6 +91,8 @@ important so let repeat it here:: $ git config --global user.name "User Name" $ git config --global user.email user.name@example.org +Put your real name and preferred email. + Examples in this PEP ==================== @@ -98,9 +100,9 @@ Examples in this PEP 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``. Usually the currently -checked out branch is ``v2``. That is, it's assumed you did something -like:: +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:: $ git clone -b v1 http://git.python.org/python.git $ cd python @@ -121,9 +123,11 @@ To see what commits have not been published yet compare the head of the branch with its upstream remote branch:: $ git log origin/v2.. + $ git log origin/v1..v1 For every branch that has an upstream remote branch git maintains an -alias @{upstream} (short version @{u}):: +alias @{upstream} (short version @{u}), so the commands above can be +given as:: $ git log @{u}.. $ git log v1@{u}..v1 @@ -132,7 +136,7 @@ To see the status of all branches:: $ git branch -avv -To compare the status of local branches with remote repo:: +To compare the status of local branches with a remote repo:: $ git remote show origin -- 2.39.5