summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-06-14 13:07:58 +0200
committerJonas Smedegaard <dr@jones.dk>2008-06-14 13:07:58 +0200
commit1da62670810ccb26988c676982ab29d3f407183f (patch)
tree4b3397e696c1c67584bbfd83ef0e918efcb79e40
parent28564376b810bd3040256827dea6c8ec0ea03a70 (diff)
In update: fetch once, then for each branch (crate and) merge.
-rw-r--r--make/git.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/make/git.mk b/make/git.mk
index f8436f8..068e7f3 100644
--- a/make/git.mk
+++ b/make/git.mk
@@ -11,8 +11,10 @@ currentbranch = $(shell git branch | grep ^\* | awk '{ print $2 }')
noncurrentbranches = $(filter-out $(currentbranch),$(branches))
update:
- $(if $(filter $(currentbranch),$(master)),,git checkout "$(master)")
- git pull
+ git fetch $(origin)
+ $(if $(filter $(currentbranch),$(master)),,git branch -f "$(master)" "$(origin)/$(master)" && git checkout "$(master)")
+ git merge --no-commit "$(origin)"
+ $(if $(noncurrentbranches),$(foreach branch,$(noncurrentbranches),git branch -f "$(branch)" "$(origin)/$(branch)" && git checkout "$(branch)" && git merge --no-commit "$(origin)" &&) git checkout "$(master)")
init:
# Assume that initial cloning is done already when invoking this target
-nan%;'/> -rw-r--r--tags/a8/85/20111019133215.18114.57279.reportbug@localhost6.localdomain6/debian0
-rw-r--r--tags/a8/85/20140104052524.0F4A5381BE@slamuf.jones.dk/jones0
-rw-r--r--tags/a8/85/20140104052524.0F4A5381BE@slamuf.jones.dk/sys0
-rw-r--r--tags/a8/85/20141201121034.GA9320@jwilk.net/debian0
-rw-r--r--tags/a8/85/20141201121034.GA9320@jwilk.net/signed0
-rw-r--r--tags/a8/85/20161115021823.D76445102@xayide.jones.dk/jones0
-rw-r--r--tags/a8/85/20161115021823.D76445102@xayide.jones.dk/sys0
-rw-r--r--tags/a8/85/20190831220007.1989D230A@xayide.jones.dk/jones0
-rw-r--r--tags/a8/85/20190831220007.1989D230A@xayide.jones.dk/sys0
-rw-r--r--tags/a8/85/20190831220007.1989D230A@xayide.jones.dk/unread0
-rw-r--r--tags/a8/85/47f5b8aa-2b82-e19c-5849-69408992548f@64studio.com/debian0
-rw-r--r--tags/a8/85/47f5b8aa-2b82-e19c-5849-69408992548f@64studio.com/inbox0
-rw-r--r--tags/a8/85/47f5b8aa-2b82-e19c-5849-69408992548f@64studio.com/old0
-rw-r--r--tags/a8/85/AANLkTinG4xaoNHlzrCyCm9DZ_nRGsZIHC9NZAX1O-ePH@mail.gmail.com/debian0
-rw-r--r--tags/a8/85/CAO=REQ=HKuvhSR-Q-RUxa=Wv4MPFd7-ya3cvJo6UGP4ddXr-Og@mail.gmail.com/hb0
-rw-r--r--tags/a8/85/CAO=REQ=HKuvhSR-Q-RUxa=Wv4MPFd7-ya3cvJo6UGP4ddXr-Og@mail.gmail.com/replied0
-rw-r--r--tags/a8/85/XFMail.20020722101746.shalehperry@attbi.com/debian0
-rw-r--r--tags/a8/85/XFMail.20020722101746.shalehperry@attbi.com/inbox0
-rw-r--r--tags/a8/85/XFMail.20020722101746.shalehperry@attbi.com/old0
-rw-r--r--tags/a8/85/a875fd2b5afb212956d7ccd0279126f0@localhost.localdomain/inbox0
-rw-r--r--tags/a8/85/a875fd2b5afb212956d7ccd0279126f0@localhost.localdomain/killed0
-rw-r--r--tags/a8/85/a875fd2b5afb212956d7ccd0279126f0@localhost.localdomain/unread0
-rw-r--r--tags/a8/85/sctplab%2fusrsctp%2fissue%2f136%2fissue_event%2f2987120118@github.com/unread0
33 files changed, 0 insertions, 0 deletions