Extend paragraph about remote branches

[git-wiki.git] / pep-git.txt

diff --git a/pep-git.txt b/pep-git.txt
index 4cbedf62b90518b76f02adb2565cde2c7395e5df..d13193422d307f9068e66001c1d433e75995b6b0 100644 (file)
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -85,9 +85,8 @@ MacOS X: use git installed with `XCode
 <http://sourceforge.net/projects/git-osx-installer/files/>`_ or
 install git with `Homebrew <http://brew.sh/>`_: ``brew install git``.
 
-`git-cola <https://git-cola.github.io/index.html>`_ is a sleek and
-powerful Git GUI written in Python and GPL licensed. Linux, Windows,
-MacOS X.
+`git-cola <https://git-cola.github.io/index.html>`_ is a Git GUI
+written in Python and GPL licensed. Linux, Windows, MacOS X.
 
 `TortoiseGit <https://tortoisegit.org/>`_ 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::
 
@@ -394,8 +394,8 @@ i.e. ``git checkout README`` restores README to the latest commit.
 (Do not use ``git checkout`` to view a content of a file in a commit,
 use ``git cat-file -p``; e.g. ``git cat-file -p HEAD~:path/to/README``).
 
-TODO: describe undo strategies: git reset, git revert,
-git reflog. "Commit early, commit often".
+TODO: describe undo strategies: git reset, git reflog, git revert.
+"Commit early, commit often".
 
 How to undo a merge
 https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.html
@@ -463,7 +463,7 @@ feature was implemented should be in the commit messages.
 Null-merges
 ===========
 
-Git has a builtin strategy for what Python core developers call
+Git has a builtin merge strategy for what Python core developers call
 "null-merge"::
 
     $ git merge -s ours v1  # null-merge v1 into v2