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

a rollback: my git does not know about --no-edit option

Browse source
This commit is contained in:
Nikolay Pultsin 2013-07-25 00:37:12 +01:00
parent 3913a2460d
commit cf42fb1591
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/mergeAll.sh
View file

@ -1,16 +1,16 @@
#!/bin/sh #!/bin/sh
git checkout android-1.5 git checkout android-1.5
git merge --no-edit master git merge master
git checkout ice-cream-sandwich git checkout ice-cream-sandwich
git merge --no-edit master git merge master
git checkout beta git checkout beta
git merge --no-edit master git merge master
git checkout beta-ics git checkout beta-ics
git merge --no-edit beta git merge beta
git merge --no-edit ice-cream-sandwich git merge ice-cream-sandwich
git checkout master git checkout master