git常用操作
2015-03-26 15:01
183 查看
git log 查看commit的历史
git show <commit-hash-id>查看某次commit的修改内容
git log -p <filename>查看某个文件的修改历史
git log -p -2查看最近2次的更新内容
git log -p path/XXX.java
git log --oneline -3 path/XXX.java
git checkout Local_Dev
git pull --rebase
git add -A
git diff --cached
git commit -s -m "id:name_modify" //活动号id Your branch is ahead of by one commit需要先push
git push origin HEAD:CP_Module_Dev
git log
git show 号码
git log -2 --oneline
git checkout Local_Int
git checkout Local_Int origin/CP_Module_Int(第一次拉建成流)
vi .git/config
git pull --rebase
git log Local_Dev --oneline -3(-p或者无)
git cherry-pick 5302d66 (从下往上看)
git cherry-pick 第2个id
git diff --cached
git add -A
git push origin HEAD:refs/for/CP_Module_Int
git rebase -i HEAD~2(合单:2个)
输入X或者:q!退出
git log --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_Module_Int
到33服务器上进行代码走读
1、进入33服务器
2、点击All选项
3、添加走读人员
4、+1并且添加说明,publish commit
5、Change has been successfully merged into the git repository.表示已成功推送服务器
q/ctrl+c/ctrl+q退出编辑
git status -s
git reset --hard(回撤修改)
git show <commit-hash-id>查看某次commit的修改内容
git log -p <filename>查看某个文件的修改历史
git log -p -2查看最近2次的更新内容
git log -p path/XXX.java
git log --oneline -3 path/XXX.java
git checkout Local_Dev
git pull --rebase
git add -A
git diff --cached
git commit -s -m "id:name_modify" //活动号id Your branch is ahead of by one commit需要先push
git push origin HEAD:CP_Module_Dev
git log
git show 号码
git log -2 --oneline
git checkout Local_Int
git checkout Local_Int origin/CP_Module_Int(第一次拉建成流)
vi .git/config
git pull --rebase
git log Local_Dev --oneline -3(-p或者无)
git cherry-pick 5302d66 (从下往上看)
git cherry-pick 第2个id
git diff --cached
git add -A
git push origin HEAD:refs/for/CP_Module_Int
git rebase -i HEAD~2(合单:2个)
输入X或者:q!退出
git log --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_Module_Int
到33服务器上进行代码走读
1、进入33服务器
2、点击All选项
3、添加走读人员
4、+1并且添加说明,publish commit
5、Change has been successfully merged into the git repository.表示已成功推送服务器
q/ctrl+c/ctrl+q退出编辑
git status -s
git reset --hard(回撤修改)