summaryrefslogtreecommitdiff
path: root/make/git.mk
blob: 00594487ad6ba61c0fb8b9ea27bac665717f8cf1 (plain)
  1. # main local branch (the one we want checked out)
  2. master = master
  3. # all local branches (including those needed by child clones)
  4. branches = $(master)
  5. # local name of origin
  6. origin = origin
  7. currentbranch = $(shell git branch | grep ^\* | awk '{ print $2 }')
  8. noncurrentbranches = $(filter-out $(currentbranch),$(branches))
  9. update:
  10. git fetch $(origin)
  11. $(if $(filter $(currentbranch),$(master)),,git branch -f "$(master)" "$(origin)/$(master)" && git checkout "$(master)")
  12. git merge --no-commit "$(origin)"
  13. $(if $(noncurrentbranches),$(foreach branch,$(noncurrentbranches),git branch -f "$(branch)" "$(origin)/$(branch)" && git checkout "$(branch)" && git merge --no-commit "$(origin)" &&) git checkout "$(master)")
  14. init:
  15. git init
  16. git remote add -f -m "$(master)" origin "$(origin)"
  17. git merge origin
  18. # git config remote.origin.push +"refs/heads/$(master)":"refs/heads/$(master)"
  19. .PHONY: update init
/20070326220959.D3D72F7D0F@xayide.jones.dk/jones0
-rw-r--r--tags/a3/37/20070326220959.D3D72F7D0F@xayide.jones.dk/sys0
-rw-r--r--tags/a3/37/20070512160718.9453229063@coreander.bitbase.dk/sys0
-rw-r--r--tags/a3/37/20120216203910.GI16157@jones.dk/debian0
-rw-r--r--tags/a3/37/20120216203910.GI16157@jones.dk/sent0
-rw-r--r--tags/a3/37/20120216203910.GI16157@jones.dk/signed0
-rw-r--r--tags/a3/37/20141203230041.11CEF265E@xayide.jones.dk/jones0
-rw-r--r--tags/a3/37/20141203230041.11CEF265E@xayide.jones.dk/sys0
-rw-r--r--tags/a3/37/20200619045247.91A6770598C0C0D8@indovision.tv/inbox0
-rw-r--r--tags/a3/37/20200619045247.91A6770598C0C0D8@indovision.tv/killed0
-rw-r--r--tags/a3/37/20200619045247.91A6770598C0C0D8@indovision.tv/unread0
-rw-r--r--tags/a3/37/78ac05520907221040p20c38fbewa7fa0b458ae0389f@mail.gmail.com/sugar0
-rw-r--r--tags/a3/37/78ac05520907221040p20c38fbewa7fa0b458ae0389f@mail.gmail.com/unread0
-rw-r--r--tags/a3/37/CANTw=MM1YW8RjX1JPGtyU_doFyUTOh4Qd9f1Son4ubs0-ucV2w@mail.gmail.com/debian0
-rw-r--r--tags/a3/37/bc828836-98bb-4a97-8a67-eadc1caa5d1a@xtgap4s7mta1229.xt.local/inbox0
-rw-r--r--tags/a3/37/bc828836-98bb-4a97-8a67-eadc1caa5d1a@xtgap4s7mta1229.xt.local/old0
-rw-r--r--tags/a3/37/mailman.1.1582786803.32009.teknik@lists.homebase.dk/hb0
-rw-r--r--tags/a3/37/mailman.1.1582786803.32009.teknik@lists.homebase.dk/inbox0
-rw-r--r--tags/a3/37/mailman.1.1582786803.32009.teknik@lists.homebase.dk/killed0
-rw-r--r--tags/a3/37/mailman.1.1582786803.32009.teknik@lists.homebase.dk/unread0
28 files changed, 0 insertions, 0 deletions