git操作一之新库建分支
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit$ git clone http://183.192.190.11:8085/cmam/aggregation-game-service.git -b rele...
·
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit
$ git clone http://183.192.190.11:8085/cmam/aggregation-game-service.git -b rele aseV1.1.0
Cloning into 'aggregation-game-service'...
remote: Counting objects: 1186, done.
remote: Compressing objects: 100% (480/480), done.
remote: Total 1186 (delta 471), reused 1101 (delta 434)
Receiving objects: 100% (1186/1186), 478.96 KiB | 422.00 KiB/s, done.
Resolving deltas: 100% (471/471), done.
Checking connectivity... done.
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit
$ git branch releaseV1.1.0_feature_compensation
fatal: Not a git repository (or any of the parent directories): .git
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit
$ ls
aggregation-game-service/
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit
$ cd aggregation-game-service/
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit/aggregati on-game-service (releaseV1.1.0)
$ git branch releaseV1.1.0_feature_compensation
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit/aggregati on-game-service (releaseV1.1.0)
$ git branch -v
* releaseV1.1.0 d4f19c0 filter kafka log
releaseV1.1.0_feature_compensation d4f19c0 filter kafka log
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit/aggregati on-game-service (releaseV1.1.0)
$ git branch -rv
origin/HEAD -> origin/master
origin/dev d4f19c0 filter kafka log
origin/master d4f19c0 filter kafka log
origin/releaseV1.1.0 d4f19c0 filter kafka log
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit/aggregati on-game-service (releaseV1.1.0)
$ git branch -v
* releaseV1.1.0 d4f19c0 filter kafka log
releaseV1.1.0_feature_compensation d4f19c0 filter kafka log
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit/aggregati on-game-service (releaseV1.1.0)
$ git checkout releaseV1.1.0_feature_compensation
Switched to branch 'releaseV1.1.0_feature_compensation'
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit/aggregati on-game-service (releaseV1.1.0_feature_compensation)
$ git branch -v
releaseV1.1.0 d4f19c0 filter kafka log
* releaseV1.1.0_feature_compensation d4f19c0 filter kafka log
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit/aggregati on-game-service (releaseV1.1.0_feature_compensation)
$ git branch -rv
origin/HEAD -> origin/master
origin/dev d4f19c0 filter kafka log
origin/master d4f19c0 filter kafka log
origin/releaseV1.1.0 d4f19c0 filter kafka log
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit/aggregati on-game-service (releaseV1.1.0_feature_compensation)
$ git commit -m "add function of diagnose"
On branch releaseV1.1.0_feature_compensation
Changes not staged for commit:
modified: pom.xml
modified: src/main/java/com/migu/cmam/game/aggregator/constant/constco de/CTaskDetailConst.java
modified: src/main/java/com/migu/cmam/game/aggregator/controller/GameC ontroller.java
modified: src/main/java/com/migu/cmam/game/aggregator/mq/MsgProducer.j ava
modified: src/main/java/com/migu/cmam/game/aggregator/mq/channel/ICust omSource.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/ICTas kRepository.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/IConv eyMsgRepository.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/mongo /ICTaskMongoRepository.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/mongo /IConveyMsgMongoRepository.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/mongo /impl/CTaskMongoRepositoryImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/mongo /impl/ConveyMsgMongoRepositoryImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/IAggrega tion.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/Con vergeServiceImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/Dow nloadServiceImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/Pre ServiceImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/cal lback/CallBackServiceImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/str ategy/ActpointStrategy.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/str ategy/CopyrightStrategy.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/str ategy/GameStrategy.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/str ategy/PropertyStrategy.java
modified: src/main/java/com/migu/cmam/game/aggregator/util/FilePathHel per.java
modified: src/main/resources/application.yml
Untracked files:
src/main/java/com/migu/cmam/game/aggregator/api/IDiagnoseApi.java
src/main/java/com/migu/cmam/game/aggregator/client/CompenMsgsStatusRest. java
src/main/java/com/migu/cmam/game/aggregator/client/fallback/CompenMsgsSt atusRestFallBack.java
src/main/java/com/migu/cmam/game/aggregator/compensation/
src/main/java/com/migu/cmam/game/aggregator/config/CompensationConfig.ja va
src/main/java/com/migu/cmam/game/aggregator/constant/enumcode/Compensati onStatusEnum.java
src/main/java/com/migu/cmam/game/aggregator/controller/DiagnoseControlle r.java
src/main/java/com/migu/cmam/game/aggregator/util/CompensationUtil.java
src/test/java/com/migu/cmam/game/aggregator/compensation/
no changes added to commit
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit/aggregati on-game-service (releaseV1.1.0_feature_compensation)
$ git add .
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/api/IDiagnoseApi.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/client/CompenMsgsStatusRest.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/client/fallback/CompenMsgsStatusRestFallBack.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/domain/restful/CTaskCap.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/domain/restful/ConveyMsgCap.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/domain/restful/MsgInfo.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/domain/restful/MsgInfoCap.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/domain/restful/MsgsStatusRest.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/factory/CompensationFactory.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/handler/AGHandler.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/handler/DLHandler.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/handler/HandlerCompensation.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/handler/ICompensation.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/handler/SCHandler.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/handler/SLHandler.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/service/IMsgInfoCreateService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/service/IMsgInfoStatusSendService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/service/IMsgInfoTimeOutService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/service/impl/MsgInfoCreateServiceImpl.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/service/impl/MsgInfoStatusSendServiceImpl.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/compensation/service/impl/MsgInfoTimeOutServiceImpl.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/config/CompensationConfig.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/constant/enumcode/CompensationStatusEnum.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/controller/DiagnoseController.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggrega tor/util/CompensationUtil.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/test/java/com/migu/cmam/game/aggrega tor/compensation/CompensationTest.java.
The file will have its original line endings in your working directory.
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit/aggregati on-game-service (releaseV1.1.0_feature_compensation)
$ git commit -m "add function of diagnose"
[releaseV1.1.0_feature_compensation 512e72f] add function of diagnose
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/api/IDiagnoseApi.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/client/CompenMsgsStatusRest.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/client/fallback/CompenMsgsStatusRestFallBack.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/CTaskCap.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/ConveyMsgCap.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgInfo.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgInfoCap.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgsStatusRest.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/factory/CompensationFactory.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/AGHandler.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/DLHandler.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/HandlerCompensation.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/ICompensation.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/SCHandler.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/SLHandler.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoCreateService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoStatusSendService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoTimeOutService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoCreateServiceImpl.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoStatusSendServiceImpl.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoTimeOutServiceImpl.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/config/CompensationConfig.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/constant/enumcode/CompensationStatusEnum.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/controller/DiagnoseController.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/util/CompensationUtil.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/test/java/com/migu/cmam/game/aggregator/compensation/CompensationTest.java.
The file will have its original line endings in your working directory.
48 files changed, 2857 insertions(+), 42 deletions(-)
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/api/IDiagnoseApi.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/client/CompenMsgsStatusRest.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/client/fallback/CompenMsgsStatusRestFallBack.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/CTaskCap.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/ConveyMsgCap.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgInfo.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgInfoCap.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgsStatusRest.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/factory/CompensationFactory.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/handler/AGHandler.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/handler/DLHandler.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/handler/HandlerCompensation.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/handler/ICompensation.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/handler/SCHandler.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/handler/SLHandler.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoCreateService.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoStatusSendService.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoTimeOutService.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoCreateServiceImpl.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoStatusSendServiceImpl.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoTimeOutServiceImpl.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/config/CompensationConfig.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/constant/enumcode/CompensationStatusEnum.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/controller/DiagnoseController.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/util/CompensationUtil.java
create mode 100644 src/test/java/com/migu/cmam/game/aggregator/compensation/CompensationTest.java
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit/aggregation-game-service (releaseV1.1.0_feature_compensation)
$ git branch -v
releaseV1.1.0 d4f19c0 filter kafka log
* releaseV1.1.0_feature_compensation 512e72f add function of diagnose
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit/aggregation-game-service (releaseV1.1.0_feature_compensation)
$ git branch -rv
origin/HEAD -> origin/master
origin/dev d4f19c0 filter kafka log
origin/master d4f19c0 filter kafka log
origin/releaseV1.1.0 d4f19c0 filter kafka log
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit/aggregation-game-service (releaseV1.1.0_feature_compensation)
$ git status
On branch releaseV1.1.0_feature_compensation
nothing to commit, working directory clean
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit/aggregation-game-service (releaseV1.1.0_feature_compensation)
$ git push origin releaseV1.1.0_feature_compensation
Counting objects: 92, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (79/79), done.
Writing objects: 100% (92/92), 42.93 KiB | 0 bytes/s, done.
Total 92 (delta 40), reused 0 (delta 0)
remote:
remote: To create a merge request for releaseV1.1.0_feature_compensation, visit:
remote: http://64a436126ea5/cmam/aggregation-game-service/merge_requests/new?merge_request%5Bsource_branch%5D=releaseV1.1.0_feature_compensation
remote:
To http://183.192.190.11:8085/cmam/aggregation-game-service.git
d4f19c0..512e72f releaseV1.1.0_feature_compensation -> releaseV1.1.0_feature_compensation
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit/aggregation-game-service (releaseV1.1.0_feature_compensation)
$ git branch -rv
origin/HEAD -> origin/master
origin/dev d4f19c0 filter kafka log
origin/master d4f19c0 filter kafka log
origin/releaseV1.1.0 d4f19c0 filter kafka log
origin/releaseV1.1.0_feature_compensation 512e72f add function of diagnose
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/xianwangnewGit/aggregation-game-service (releaseV1.1.0_feature_compensation)
$
开放原子开发者工作坊旨在鼓励更多人参与开源活动,与志同道合的开发者们相互交流开发经验、分享开发心得、获取前沿技术趋势。工作坊有多种形式的开发者活动,如meetup、训练营等,主打技术交流,干货满满,真诚地邀请各位开发者共同参与!
更多推荐
已为社区贡献2条内容
所有评论(0)