X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-103.txt;h=e953e0707bb644f809ca7b1c70baeb9363171ec3;hb=ab3ce2584b6b53345442a3ab4f3f2a47bf7d00b4;hp=f17f08fed55035935c912f7bca112ce230198763;hpb=5330e04c82c96fe34def416842af686b94666946;p=git-wiki.git

diff --git a/pep-103.txt b/pep-103.txt
index f17f08f..e953e07 100644
--- a/pep-103.txt
+++ b/pep-103.txt
@@ -193,18 +193,28 @@ remote-tracking branches, creates a local branch ``v1``, configure it
 to track upstream remotes/origin/v1 branch and checks out ``v1`` into
 the working directory.
 
-Some commands, like ``git status``, report the difference between
-local and remote branches. Please remember they only do comparison
-with remote-tracking branches in your local repository, and the state
-of those remote-tracking branches can be outdated. To update
-remote-tracking branches you either fetch and merge (or rebase)
-commits from the remote repository or update remote-tracking branches
-without updating local branches.
+Some commands, like ``git status --branch`` and ``git branch --verbose``,
+report the difference between local and remote branches.
+Please remember they only do comparison with remote-tracking branches
+in your local repository, and the state of those remote-tracking
+branches can be outdated. To update remote-tracking branches you
+either fetch and merge (or rebase) commits from the remote repository
+or update remote-tracking branches without updating local branches.
 
 
 Updating local and remote-tracking branches
 -------------------------------------------
 
+To update remote-tracking branches without updating local branches run
+``git remote update [$REMOTE...]``. For example::
+
+    $ git remote update
+    $ git remote update origin
+
+
+Fetch and pull
+''''''''''''''
+
 There is a major difference between
 
 ::
@@ -352,12 +362,6 @@ That changed in git 2.3, but see `the blog post
 for caveats; in 2.4 the push-to-deploy feature was `further improved
 <https://github.com/blog/1994-git-2-4-atomic-pushes-push-to-deploy-and-more#push-to-deploy-improvements>`_.
 
-To update remote-tracking branches without updating local branches run
-``git remote update [$REMOTE...]``. For example::
-
-    $ git remote update
-    $ git remote update origin
-
 
 Tags
 ''''