yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-06 03:50:19 +02:00
Code Issues Releases Wiki Activity

removed obsolete branches from merging

Browse source
This commit is contained in:
Nikolay Pultsin 2015-09-29 18:20:37 +01:00
parent 1ff99c0db1
commit 6a11c9df12
1 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scripts/mergeAll.sh
View file

@ -1,8 +1,5 @@
#!/bin/sh #!/bin/sh
git checkout tags-master
git merge master
git checkout ice-cream-sandwich git checkout ice-cream-sandwich
git merge master git merge master
@ -16,12 +13,6 @@ git checkout nook
git merge master git merge master
git checkout microtypography git checkout microtypography
git merge ice-cream-sandwich
git checkout yotabeta
git merge yota2
git checkout betayota
git merge yota2 git merge yota2
git checkout 2.6ics git checkout 2.6ics