git 常用操作

aapt dump xmltree test.apk AndroidManifest.xml //查看manifest内容

git config --global user.name "***"

git config --global user.email "****"

git checkout Local_Dev

git pull --rebase

git add -A

git diff --cached

git commit -s -m "id:name_app_SystemUI_fix:" //活动号id Yourbranch is ahead of by one commit需要先push

git commit -s -m "TFS_400239:name_app_SystemUI_fix:Hide"

git log -5 --oneline

git push origin HEAD:CP_SystemUI_Dev //推送到开发流

git log

git show commit-id

git log -5 --oneline

git checkout Local_Int

gitcheckout Local_Int origin/CP_SystemUI_Int(第一次拉建成流)

vi.git/config

git pull --rebase

git log Local_Dev --oneline -3(-p或者无)

git cherry-pick 5302d66 (从下往上看)

git cherry-pick 第2个id

git log --oneline -5

git add -A

git diff --cached

git push origin HEAD:refs/for/CP_SystemUI_Int

git push --no-thin origin HEAD:refs/for/CP_SystemUI_Int

git log --oneline -5 //查看最近5个提交活动

gitrebase -i HEAD~2(合单：2个)

输入X或者:q!退出

gitlog --oneline -5

1

2

3

标记第3次（上一次）

git reset --soft(第3个id)

git status

git add -A

git commit -s -m "活动号:name_modifyxx"

git push origin HEAD:refs/for/CP_SystemUI_Int //推送到集成流

//重新获取当前所有最新服务器代码

git checkout -b SystemUI_Local_Dev origin/CP_SystemUI_Dev

git checkout .

git branch -D Local_Dev

git checkout -b Local_Dev origin/CP_SystemUI_Dev

git branch -D SystemUI_Local_Dev