PandacubeFr/PandaCord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix patch conflicts

Browse Source
This commit is contained in:
Techcable 2017-01-15 10:05:31 -07:00 committed by Marc Baloup
parent 137ece1d33
commit d7cfd8cf29
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mergeUpstream.sh Executable file
View File

@ -0,0 +1,15 @@
PS1="$"
basedir=`pwd`
function update {
cd "$basedir/$1"
git fetch && git reset --hard origin/master
cd "$basedir/$1/.."
git add $1
}
update Waterfall
# Update submodules
git submodule update --recursive