aboutsummaryrefslogtreecommitdiffstats
path: root/README.git
diff options
context:
space:
mode:
authorJuergen Kahrs <Juergen.Kahrs@googlemail.com>2014-06-24 13:18:33 +0200
committerJuergen Kahrs <Juergen.Kahrs@googlemail.com>2014-06-24 13:18:33 +0200
commitf1245d04a9f076773c60499b468f44ed9c91b59b (patch)
tree2b49234400150bfaac7ebf8c017562300edc7471 /README.git
parentee9707cc44eea3ca64cb71666ac3e8ed26a3bb7f (diff)
parent78ded8ee8f11a321c96417e7d02dac2f5723a221 (diff)
downloadegawk-f1245d04a9f076773c60499b468f44ed9c91b59b.tar.gz
egawk-f1245d04a9f076773c60499b468f44ed9c91b59b.tar.bz2
egawk-f1245d04a9f076773c60499b468f44ed9c91b59b.zip
Merge remote-tracking branch 'origin/master' into cmake
Diffstat (limited to 'README.git')
-rw-r--r--README.git15
1 files changed, 14 insertions, 1 deletions
diff --git a/README.git b/README.git
index 7d0d260c..c947cc24 100644
--- a/README.git
+++ b/README.git
@@ -1,4 +1,4 @@
-Sat Dec 1 21:53:02 IST 2012
+Thu Apr 17 16:54:26 IDT 2014
============================
If you are reading this, you have retrieved the gawk code base via
@@ -350,3 +350,16 @@ has been pushed up to the Savannah repo or not.
If your branch is completely local to your machine, use `git rebase'.
Otherwise, use `git merge'.
+
+- How do I remove branches in my local repo that are no longer in the
+ remote repo?
+
+ Either
+ git fetch --prune
+ or
+ git remote prune origin
+
+ These remove the remote branches (i.e., origin/something)
+ that no longer exist on the remote.
+
+ (Thanks to Stepan Kasal for this answer.)