diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-05-10 20:31:40 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-05-10 20:31:40 +0200 |
| commit | dfa96a49bbdcb0938746adf8d2da7ffac00a6222 (patch) | |
| tree | 6baedebcd87a44cac5f8b4fb15ed0a016fc58d26 /git | |
| parent | 6f2c9210413a68524aaebe2c1a0bd9a54dbcd74a (diff) | |
| parent | 262912f0c8545a82fe2fbf68699cc53d65384b1d (diff) | |
| download | serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.tar.gz serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.tar.bz2 serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.tar.xz serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.zip | |
Merge remote-tracking branch 'origin/master' into waric
Diffstat (limited to 'git')
| -rwxr-xr-x | git/hooks/post-merge | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git/hooks/post-merge b/git/hooks/post-merge index c5354cfd..1105fd9f 100755 --- a/git/hooks/post-merge +++ b/git/hooks/post-merge @@ -13,4 +13,4 @@ git submodule update --merge # WARNING: to people with push access. # it is essential that changes to the client data be pushed before changes to server data # Also, you may find this useful: (you should always clone using the git:// url) -# git config --global url.git@gitorious.org:.pushInsteadOf git://gitorious.org +# git config --global url.git@github.com:.pushInsteadOf git://github.com |