持续更新

双击shift ,弹出查找。

ffmpeg -i film.avi -b 1.5M film.mp4
ffmpeg -i film.mp4 -s 480x360 film.mp4

Boom Clap (Surkin Remix) (《星运里的错》电影插曲)

Android root path
/storage/emulated/0

mysql dev download http://dev.mysql.com/downloads/mysql/
mysqld -install
mysqld -remove
net start mysql
net stop mysql
mysql -u root -p
set password for ‘root’@’localhost’=password(‘new password’)

my.ini:
basedir = E:\Program Files\mysql-5.6.32-winx64
datadir = E:\Program Files\mysql-5.6.32-winx64\data
port = 3306
character-set-server=utf8

git use:
git status
git add xxxxx.xx
git commit -m “log message”
git push

git make key:
git config –global user.name “liqiong”
git config –global user.email “liqiong456@126.com”
ssh-keygen -t rsa -C “liqiong456@126.com”
密码不用输入,按三个回车就好了。
make id_rsa and id_rsa.pub
vim id_rsa.pub
copy id_rsa.pub value put to github.com setting SSH and GPG keys. New SSH key.

git init:
new project push code reach github:
git init
git add - -all
git commit -m “log message”
⚠:git push fail
git pull - -rebase [remote] master
git push [remote] master

git remote:
git remote add [name] [git:url….]
git remote -v
gti remote

git branch:
::: [name] 是分支名称
git branch [name]
git checkout [name] //切换分支
git push origin [name] //分支提交
///////////////
git checkout master //切换到主
git merge master [name] //合并代码
git push //提交代码
git 冲突:
如果产生了冲突,不git pull 是无法执行push的。
git pull
git status
检查文件,修改冲突
git add file
git commit
git push
OK!
git reset:
git reset HEAD^
git reset HEAD^ xxx.java
git reset 0327d
git checkout
git checkout –
Android Studio
不换行:Editor->Code Style->java->Wrapping and Braces->Line breaks
editor background: Editor->Colors&Fonts->General->Default text->Background(check right CheckButton)->Color:#CCE8CF