hanez/home
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

forksync now uses merge not rebase

Browse source
This commit is contained in:
Johannes Findeisen 2019-01-18 21:28:48 +01:00
commit ca8b9d2537
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bin/forksync.sh
View file

@ -9,8 +9,8 @@ for repo in /home/hanez/forks/*; do
git checkout master
git rebase upstream/master
#git merge upstream/master
#git rebase upstream/master
git merge upstream/master
git push -f origin master
done