mirror of
https://github.com/sys4-fr/server-nalc.git
synced 2024-11-05 18:10:26 +01:00
8b8fdfa131
- Merged api : - little tweaks on yaw computing system and position handling when blasting - Centralisation of the explosion function used by both dungeon masters and creepers : checks are made differently but still present in the function - Merged dungeon masters - Changed type of creepers from kamikaze to explode - Tweaked a bit rebase script
17 lines
358 B
Bash
Executable File
17 lines
358 B
Bash
Executable File
# Rebase actives branches
|
|
# Script by LeMagnesium (20/12/15)
|
|
# @param : Branches to rebase from master
|
|
# Must be ran from the root of the repo or a subdirectory
|
|
|
|
for branch in $( git branch ); do
|
|
if [ branch != "master" ];
|
|
then
|
|
git checkout $branch
|
|
git pull origin $branch
|
|
git rebase master
|
|
git push -f origin $branch
|
|
fi
|
|
done
|
|
|
|
git checkout master
|