From 19a69a9daa7578d2bc08b0e0cf026200fd2e6775 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 14 Apr 2008 00:05:00 +0200 Subject: Name local l10n branches matching remote ones, when init'ing git. --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e388f0b..b85590a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE ikiwiki_MODULES = templates basewiki smiley ikiwiki_POMODULES = smiley ikiwiki_BRANCH = master-LOCALE -ikiwiki_LOCALES = da +ikiwiki_LOCALES = da no_NB #ikiwiki_POLOCALES = da #dummy_MODULES = content_dummy @@ -54,7 +54,8 @@ $(1): git init && \ git remote add -f -t $$(master) -m $$(master) origin $$(origin) && \ git merge origin && \ - git config remote.origin.push +refs/heads/master:refs/heads/$$(master); \ + git branch -m $$(master) && \ + git config remote.origin.push +refs/heads/$$(master):refs/heads/$$(master); \ fi -- cgit v1.2.3