summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartin f. krafft <madduck@madduck.net>2008-03-11 19:18:05 +0100
committerJoey Hess <joey@kodama.kitenet.net>2008-03-11 15:40:07 -0400
commit227107b21864dedb40995875c6a68c1a2a665f9a (patch)
treeb263ad0a5fcd9df042a9d73fdd8d6efb8858c1f6
parentced0e9f9866a4e609203e6d1c43fa76f7fdecc55 (diff)
Make makerepo set the Git merge remote
branch.master.remote previously used to default to origin, which has recently been changed; it now needs to be set explicitly, which this patch does. Closes Debian bug #470517. Signed-off-by: martin f. krafft <madduck@madduck.net>
-rwxr-xr-xikiwiki-makerepo1
1 files changed, 1 insertions, 0 deletions
diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index a97c060c2..6ae3e28a3 100755
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -62,6 +62,7 @@ git)
git commit -m "initial commit"
git remote add origin "$repository"
git config branch.master.merge refs/heads/master
+ git config branch.master.remote origin
git push --all
echo "Directory $srcdir is now a clone of $rcs repository $repository"
;;