summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-04-14 00:05:00 +0200
committerJonas Smedegaard <dr@jones.dk>2008-04-14 00:05:00 +0200
commit19a69a9daa7578d2bc08b0e0cf026200fd2e6775 (patch)
tree507746f864c323015af92aef49a59a1806b6dd96 /Makefile
parentf2ef77fe6c56e979a64f307ff44b9b575b9d12f2 (diff)
Name local l10n branches matching remote ones, when init'ing git.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
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