``git status --branch`` and ``git branch --verbose``

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

diff --git a/pep-103.txt b/pep-103.txt
index b5ef798a0a46f89f01f9b657d6b47013433ff6fa..bf8e3898f3f8daf0f259b9bb2c69fed67ba206f4 100644 (file)
--- a/pep-103.txt
+++ b/pep-103.txt
@@ -193,6 +193,14 @@ 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 --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
 -------------------------------------------
@@ -344,6 +352,12 @@ 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
 ''''