diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2016-10-10 18:55:55 +0100 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2016-10-10 18:55:55 +0100 |
| commit | 831fccc272518113401b7f62bb23e62afc706e03 (patch) | |
| tree | d852501dc338b0dc0a037002ef4fe54496bfab6b /mr | |
| parent | 70537ec9683b3e5db8c76597125fbfae9b51364b (diff) | |
| parent | 99587dca308e085b2accb72a89896b5a63cb20e1 (diff) | |
Merge changes from brix
Diffstat (limited to 'mr')
| -rw-r--r-- | mr/.mrconfig | 13 | ||||
| -rw-r--r-- | mr/.mrtrust | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/mr/.mrconfig b/mr/.mrconfig index a007de9..73b38d3 100644 --- a/mr/.mrconfig +++ b/mr/.mrconfig @@ -1,19 +1,24 @@ [$HOME/dotfiles] -checkout = git clone 'git@urbainvaes.com:dotfiles.git' 'dotfiles' +checkout = git clone 'gitolite@urbainvaes.com:dotfiles.git' dotfiles update = git pull origin master push = git push origin master [$HOME/gitolite] -checkout = git clone 'git@urbainvaes.com:gitolite-admin.git' 'gitolite' +checkout = git clone 'gitolite@urbainvaes.com:gitolite-admin.git' gitolite update = git pull origin master push = git push origin master [$HOME/personal] -checkout = git clone 'git@urbainvaes.com:private/personal.git' 'personal' +checkout = git clone 'gitolite@urbainvaes.com:private/personal.git' personal update = git pull origin master push = git push origin master [$HOME/.password-store] -checkout = git clone 'git@urbainvaes.com:private/passwords.git' '.password-store' +checkout = git clone 'gitolite@urbainvaes.com:private/passwords.git' .password-store +update = git pull origin master +push = git push origin master + +[$HOME/phd] +checkout = git clone 'gitolite@urbainvaes.com:phd/base.git' phd update = git pull origin master push = git push origin master diff --git a/mr/.mrtrust b/mr/.mrtrust index aa0f340..5f0dbe2 100644 --- a/mr/.mrtrust +++ b/mr/.mrtrust @@ -1 +1 @@ -~/Dropbox/phd/.mrconfig +~/phd/.mrconfig |