summaryrefslogtreecommitdiff
path: root/localikiwikicreatesite
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-02-13 15:32:13 +0000
committerJonas Smedegaard <dr@jones.dk>2008-02-13 15:32:13 +0000
commit9b873f0335b3b035146413182522f2f1d59293a0 (patch)
tree497ef01bde490683503e544ca1dc382288135322 /localikiwikicreatesite
parentf9af577b7206318e33530af7c07932baf9365ca2 (diff)
Fix setting Git branch.master.remote on working repositories.
Diffstat (limited to 'localikiwikicreatesite')
-rwxr-xr-xlocalikiwikicreatesite4
1 files changed, 3 insertions, 1 deletions
diff --git a/localikiwikicreatesite b/localikiwikicreatesite
index be6630a..95653d0 100755
--- a/localikiwikicreatesite
+++ b/localikiwikicreatesite
@@ -3,7 +3,7 @@
# /usr/local/bin/localikiwikicreatesite
# Copyright 2008 Jonas Smedegaard <dr@jones.dk>
#
-# $Id: localikiwikicreatesite,v 1.12 2008-02-13 15:26:54 jonas Exp $
+# $Id: localikiwikicreatesite,v 1.13 2008-02-13 15:32:13 jonas Exp $
#
# Initialize ikiwiki site
#
@@ -116,6 +116,7 @@ echo /.ikiwiki > .gitignore
git add .
git commit -m "initial commit"
git remote add origin $DESTSRCDIR/${project}_content.git
+git config branch.master.remote origin
git config branch.master.merge refs/heads/master
git push --all
chmod +x $DESTSRCDIR/${project}_content.git/hooks/post-update
@@ -128,6 +129,7 @@ echo /content > .gitignore
git add .
git commit -m "initial commit"
git remote add origin $DESTSRCDIR/$project.git
+git config branch.master.remote origin
git config branch.master.merge refs/heads/master
git push --all
chmod +x $DESTSRCDIR/${project}.git/hooks/post-update