From afd0c6a745a6364a545abb8a72a767a78c4ed694 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Wed, 3 Jun 2015 21:08:06 +0300 Subject: [PATCH] Change wording --- pep-git.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pep-git.txt b/pep-git.txt index 1295dbb..118fc87 100644 --- a/pep-git.txt +++ b/pep-git.txt @@ -101,8 +101,8 @@ 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 v1 http://git.python.org/python.git $ cd python @@ -146,10 +146,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:: @@ -325,7 +325,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 -- 2.39.5