git移植操作

移植平台：

5979  git remote add 3252kk ssh://vanzo/platform_kk_6732_6752/packages/apps/Email.git
5980  git pull 3252kk
5981  git br -av
5982  git co -b 3252_ophone remotes/3252kk/ophone
5983  git br -av
5984  git co -b 3252_vtrunk remotes/3252kk/vtrunk
5985  git br -va
5986  git co 3252_ophone
5987  git br -av
5988  git reset --soft 3252_vtrunk
5989  git st .
5990  git diff --cached src/com/android/email/activity/setup/AccountSettings.java
5991  git diff --cached src/com/android/email/activity/setup/AccountSetupBasics.java
5992  git diff --cached src/com/android/email/activity/setup/AccountSetupType.java
5993  git st .
5994  git ci -m "Ophone Commit:merge 3252kk email"
5995  git br -av
5996  git co work
5997  git cherry-pick e0caa05

posted @ 2015-09-23 15:00  williamgufeng  阅读(445)  评论(0)  编辑  收藏  举报