X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-git.txt;h=d13193422d307f9068e66001c1d433e75995b6b0;hb=b6a0118c91b2b25286fb32dca9f546012feb3ce6;hp=90f7a3ac73fdf62986cfbde08455c18a20680fed;hpb=e9f0eb9877ceacfc1589c79885bcab0d0a390647;p=git-wiki.git
diff --git a/pep-git.txt b/pep-git.txt
index 90f7a3a..d131934 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -85,9 +85,8 @@ MacOS X: use git installed with `XCode
`_ or
install git with `Homebrew `_: ``brew install git``.
-`git-cola `_ is a sleek and
-powerful Git GUI written in Python and GPL licensed. Linux, Windows,
-MacOS X.
+`git-cola `_ is a Git GUI
+written in Python and GPL licensed. Linux, Windows, MacOS X.
`TortoiseGit `_ is a Windows Shell Interface
to Git based on TortoiseSVN; open source.
@@ -150,8 +149,8 @@ Labels, on the other hand, can be created, moved, renamed and deleted
freely.
-Remote repository and remote branches
-=====================================
+Remote repositories and remote branches
+=======================================
Another example of slightly misleading terminology. Remote
repositories are really remote, you access them via network (well, a
@@ -174,9 +173,10 @@ To see local and remote branches (and tags) pointing to commits::
You never do your own development on remote branches. You create a
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.
+on that local branch. On push git pushes commits to the remote repo
+and updates remote branches, on pull git fetches commits from the
+remote repo, updates remote branches and fast-forwards, merges or
+rebases local branches.
When you do an initial clone like this::