summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-20 18:31:02 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-20 18:31:02 +0200
commit3c69ff6ae48754a677a316af9b5f0001c562acbc (patch)
treee8d67340c41cafada46c70c62182b8f30b2c706b
parentc4b5478e5ad0117f6791a2cc2fc5ec2f2800da0a (diff)
parent3e354c881bdb39f8b451a78c98a981f50c7a00bf (diff)
Merge branch 'master' into nonedit
-rw-r--r--make/git.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/make/git.mk b/make/git.mk
index 5595057..2c8c827 100644
--- a/make/git.mk
+++ b/make/git.mk
@@ -7,6 +7,7 @@ branches = $(master)
# local name of origin
origin = origin
+allbranches = $(sort $(master) $(branches))
currentbranch := $(shell git branch | grep ^\* | awk '{ print $2 }')
noncurrentbranches := $(filter-out $(currentbranch),$(branches))
@@ -15,15 +16,15 @@ localbranches := $(shell git branch | perl -ne 'm,^.\s+([a-z_]\S+)$$, && print "
update:
git fetch $(origin)
- for branch in $(filter-out $(localbranches),$(branches)); do \
- git branch $$branch $(origin)/$(branch); \
+ for branch in $(filter-out $(localbranches),$(allbranches)); do \
+ git branch $$branch $(origin)/$$branch; \
done
- git checkout $(master)
- git pull $(origin)
for branch in $(noncurrentbranches); do \
- git checkout $(branch); \
+ git checkout $$branch; \
git pull $(origin); \
done
+ git checkout $(master)
+ git pull $(origin)
init:
git init