summaryrefslogtreecommitdiff
path: root/pull.sh
AgeCommit message (Collapse)AuthorFilesLines
2015-04-02Add new task "media" for evol-media repository.Andrei Karas1-0/+1
2014-12-28Add into pull and status script checking for diverged branches.Andrei Karas1-1/+1
2014-12-23Fix style in shell scripts.Andrei Karas1-13/+13
2014-11-24Add force key to pull.shAndrei Karas1-1/+11
With this key it will start git pull even if changes present. It will merge if conflict happend This option must NOT used by developers. Examples: ./pull.sh force
2014-11-18Use git-reset after pulling from server-code branch.Andrei Karas1-1/+22
This will prevent merge conflicts with rebased code.
2014-11-16Add manaplus into supported tasks and repositories.Andrei Karas1-0/+1
2014-11-12In init.sh replace bin action to local.Andrei Karas1-0/+1
Also add server-local to all scripts.
2014-11-10add art repo into git tools.Andrei Karas1-0/+1
2014-11-05Rename pullall.sh and pushall.sh to pull.sh and push.shAndrei Karas1-0/+27