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
commit5372326f884ddb654cf47edf9333eb9deed0b155 (patch)
treef763016890c5d21357a0e1a019662b90faaa4c2a
parentfd4fde6bb6ae751428cb974459a014d99cd968cc (diff)
parent3e354c881bdb39f8b451a78c98a981f50c7a00bf (diff)
Merge branch 'master' into _clean
-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
/> -rw-r--r--tags/a7/c0/20161223202355.30350.95353@wilder.debian.org/inbox0
-rw-r--r--tags/a7/c0/20161223202355.30350.95353@wilder.debian.org/old0
-rw-r--r--tags/a7/c0/20171024160304.5EE5812C00A3@artemis.puri.sm/inbox0
-rw-r--r--tags/a7/c0/20171024160304.5EE5812C00A3@artemis.puri.sm/old0
-rw-r--r--tags/a7/c0/80399d166b178142e7c23a7a082e08b4.squirrel@emailmg.ipage.com/sugar0
-rw-r--r--tags/a7/c0/911a95431b0f9e5e9a37871b7e85533a@localhost.localdomain/inbox0
-rw-r--r--tags/a7/c0/911a95431b0f9e5e9a37871b7e85533a@localhost.localdomain/old0
-rw-r--r--tags/a7/c0/CANru=_sb8EFan1re9KRxpvQFT5dRr2mS_2a_n0mcuxeZo4zO7Q@mail.gmail.com/debian0
-rw-r--r--tags/a7/c0/CANru=_sb8EFan1re9KRxpvQFT5dRr2mS_2a_n0mcuxeZo4zO7Q@mail.gmail.com/unread0
-rw-r--r--tags/a7/c0/E1mjwR9-0006OP-A6@respighi.debian.org/debian0
-rw-r--r--tags/a7/c0/E1mjwR9-0006OP-A6@respighi.debian.org/inbox0
-rw-r--r--tags/a7/c0/E1mjwR9-0006OP-A6@respighi.debian.org/killed0
-rw-r--r--tags/a7/c0/E1mjwR9-0006OP-A6@respighi.debian.org/unread0
-rw-r--r--tags/a7/c0/E1nCR39-000FW5-3o@fasolo.debian.org/debian0
-rw-r--r--tags/a7/c0/E1nCR39-000FW5-3o@fasolo.debian.org/inbox0
-rw-r--r--tags/a7/c0/E1nCR39-000FW5-3o@fasolo.debian.org/killed0
-rw-r--r--tags/a7/c0/E1nCR39-000FW5-3o@fasolo.debian.org/unread0
-rw-r--r--tags/a7/c0/E1nhevc-000GS4-Bs@fasolo.debian.org/debian0
-rw-r--r--tags/a7/c0/E1nhevc-000GS4-Bs@fasolo.debian.org/inbox0
-rw-r--r--tags/a7/c0/E1nhevc-000GS4-Bs@fasolo.debian.org/killed0
-rw-r--r--tags/a7/c0/adiknoth%2fnetatalk-debian%2fcommit%2fc553ce269414f59a7519ef3152b4fb141e772fa0%2f15566888@github.com/inbox0
-rw-r--r--tags/a7/c0/adiknoth%2fnetatalk-debian%2fcommit%2fc553ce269414f59a7519ef3152b4fb141e772fa0%2f15566888@github.com/old0
-rw-r--r--tags/a7/c0/b4e17b1402054e590993f03f117d530a@async.facebook.com/inbox0
-rw-r--r--tags/a7/c0/b4e17b1402054e590993f03f117d530a@async.facebook.com/old0
-rw-r--r--tags/a7/c0/da6ee9d1-450f-ea33-3506-f436462f9cf8@freenet.de/debian0
-rw-r--r--tags/a7/c0/da6ee9d1-450f-ea33-3506-f436462f9cf8@freenet.de/inbox0
-rw-r--r--tags/a7/c0/da6ee9d1-450f-ea33-3506-f436462f9cf8@freenet.de/old0
39 files changed, 0 insertions, 0 deletions