extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-31 02:21:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

get "mr up" to behave a bit more "sane", by:

Browse Source 
- rebase not yet pushed commits on top of existing commits from repo
- stash uncommited stuff before pull and reapply it after again
This commit is contained in:
Ralf Becker 2016-05-19 12:16:35 +02:00
parent 649d68a8c3
commit 2bbc6ec0bb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.mrconfig
View File

@ -3,6 +3,10 @@
# - to install or update run inside EGroupware dir: mr up
# - alternativly you can also run the commands manually
[DEFAULT]
git_update = git stash -q || true ; git pull --rebase ; git stash pop -q 2>/dev/null || true
jobs = 5
[api/src/Db/ADOdb]
checkout = git clone git@github.com:EGroupware/ADOdb.git
@ -13,7 +17,7 @@ checkout = svn checkout https://github.com/EGroupware/ckeditor-dev/branches/trun
# to run composer.phar automatic, this .mrconfig need to be trusted by adding it to ~/.mrtrust
checkout = git clone git@github.com:EGroupware/egroupware.git &&
/usr/bin/env composer.phar install
update = git pull &&
update = git stash -q || true ; git pull --rebase ; git stash pop -q 2>/dev/null || true;
/usr/bin/env composer.phar install
###