From 9b873f0335b3b035146413182522f2f1d59293a0 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 13 Feb 2008 15:32:13 +0000 Subject: Fix setting Git branch.master.remote on working repositories. --- localikiwikicreatesite | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'localikiwikicreatesite') 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 # -# $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 -- cgit v1.2.3