git

**代码
`win7@win7-PC MINGW64 ~ (master)
$ cd C:\Users\win7\rinlink-projects\rinlink-d603-parent
bash: cd: C:Userswin7rinlink-projectsrinlink-d603-parent: No such file or directory

win7@win7-PC MINGW64 ~ (master)
$ cd rinlink-projects/

win7@win7-PC MINGW64 ~/rinlink-projects (master)
$ cd ~

win7@win7-PC MINGW64 ~ (master)
$ ls
「开始」菜单@
AppData/
‘Application Data’@ xba-a1
Contacts/
Cookies@
Desktop/
doc2any.ini
Documents/
Downloads/
Favorites/
‘Foxit Reader SDK ActiveX.ini’
IdeaProjects/
IntelGraphicsProfiles/
Links/
‘Local Settings’@
Music/
‘My Documents’@
NetHood@
NTUSER.DAT
ntuser.dat.LOG1
ntuser.dat.LOG2
NTUSER.DAT{016888bd-6c6f-11de-8d1d-001e0bcde3ec}.TM.blf
NTUSER.DAT{016888bd-6c6f-11de-8d1d-001e0bcde3ec}.TMContainer00000000000000000001.regtrans-ms
NTUSER.DAT{016888bd-6c6f-11de-8d1d-001e0bcde3ec}.TMContainer00000000000000000002.regtrans-ms
ntuser.ini
Pictures/
Postman/
PrintHood@
projects/
Recent@
rinlink-projects/
‘Saved Games’/
Searches/
SendTo@
Templates@
Videos/

win7@win7-PC MINGW64 ~ (master)
$ cd …

win7@win7-PC MINGW64 /c/Users
$ cd win7/java_project/

win7@win7-PC MINGW64 ~/java_project (master)
$ git clone C:\Users\win7\rinlink-projects\rinlink-d603-paren^C
g
win7@win7-PC MINGW64 ~/java_project (master)
$ g^C

win7@win7-PC MINGW64 ~/java_project (master)
$ git clone https://github.com/yhydev/rinlink-projects.git
Cloning into ‘rinlink-projects’…
Username for ‘https://github.com’:
win7@win7-PC MINGW64 ~/java_project
$ git clone https://github.com/yhydev/rinlink-projects.git
Cloning into ‘rinlink-projects’…
Username for ‘https://github.com’: liuwenchao0621
remote: Enumerating objects: 2024, done.
remote: Counting objects: 100% (2024/2024), done.
remote: Compressing objects: 100% (935/935), done.
remote: Total 2024 (delta 483), reused 1881 (delta 340), pack-reused 0
Receiving objects: 100% (2024/2024), 290.35 KiB | 672.00 KiB/s, done.
Resolving deltas: 100% (483/483), done.
Checking out files: 100% (396/396), done.

win7@win7-PC MINGW64 ~/java_project
$ ls
rinlink-projects/

win7@win7-PC MINGW64 ~/java_project
$ cd rinlink-projects/

win7@win7-PC MINGW64 ~/java_project/rinlink-projects (master)
$ git checkout
HEAD master origin/HEAD origin/master

win7@win7-PC MINGW64 ~/java_project/rinlink-projects (master)
$ git checkout -b d603-restserver
Switched to a new branch ‘d603-restserver’

win7@win7-PC MINGW64 ~/java_project/rinlink-projects (d603-restserver)
$ ls
maven-test/ rinlink-service-register-center/
rinlink-ccb-audio-parent/ rinlink-telcomiot-data-processes/
rinlink-common/ rinlink-telcomiot-n256-data-processes/
rinlink-config-server/ rinlink-telcomiot-parent/
rinlink-d603-parent/ rinlink-telcomiot-position-processes/
rinlink-data-processes/ rinlink-test-udp-server/
rinlink-go-shopping/ rinlink-web-common/
rinlink-iot-parent/ rinlink-web-exception/
rinlink-kafka-rest-producer-server/ rinlink-web-validator/
rinlink-kafka-support/ rinlink-yangma/
rinlink-parent/ spring-boot-starter-iot-restclient/
rinlink-position-parent/ spring-boot-starter-position-restclient/
rinlink-restclient-sdk/ spring-boot-starter-thread-pool/

win7@win7-PC MINGW64 ~/java_project/rinlink-projects (d603-restserver)
$ git status
On branch d603-restserver
Untracked files:
(use “git add …” to include in what will be committed)

    rinlink-d603-parent/rinlink-d603-restserver/src/main/java/com/rinlink/d603/controller/IotDeviceController.java
    rinlink-d603-parent/rinlink-d603-restserver/src/main/java/com/rinlink/d603/service/IotDeviceService.java
    rinlink-d603-parent/rinlink-d603-restserver/src/main/java/com/rinlink/d603/service/imp/IotDeviceServiceImpl.java

nothing added to commit but untracked files present (use “git add” to track)
g
win7@win7-PC MINGW64 ~/java_project/rinlink-projects (d603-restserver)
$ git add rinlink-d603-parent/rinlink-d603-restserver/^C

win7@win7-PC MINGW64 ~/java_project/rinlink-projects (d603-restserver)
$ git add .

win7@win7-PC MINGW64 ~/java_project/rinlink-projects (d603-restserver)
$ git commit -m ‘d603 restserver 新增设备管理接口’
[d603-restserver 3c227d0] d603 restserver 新增设备管理接口
3 files changed, 145 insertions(+)
create mode 100644 rinlink-d603-parent/rinlink-d603-restserver/src/main/java/com/rinlink/d603/controller/IotDeviceController.java
create mode 100644 rinlink-d603-parent/rinlink-d603-restserver/src/main/java/com/rinlink/d603/service/IotDeviceService.java
create mode 100644 rinlink-d603-parent/rinlink-d603-restserver/src/main/java/com/rinlink/d603/service/imp/IotDeviceServiceImpl.java

win7@win7-PC MINGW64 ~/java_project/rinlink-projects (d603-restserver)
$ git che
checkout cherry cherry-pick

win7@win7-PC MINGW64 ~/java_project/rinlink-projects (d603-restserver)
$ git che
checkout cherry cherry-pick

win7@win7-PC MINGW64 ~/java_project/rinlink-projects (d603-restserver)
$ git checkout master
Switched to branch ‘master’
Your branch is up to date with ‘origin/master’.

win7@win7-PC MINGW64 ~/java_project/rinlink-projects (master)
$ git merge d603-restserver
d603-restserver master origin/master
HEAD origin/HEAD

win7@win7-PC MINGW64 ~/java_project/rinlink-projects (master)
$ git merge d603-restserver
Updating 071b878…3c227d0
Fast-forward
…/d603/controller/IotDeviceController.java | 36 ++++++++++++
…/com/rinlink/d603/service/IotDeviceService.java | 41 +++++++++++++
…/d603/service/imp/IotDeviceServiceImpl.java | 68 ++++++++++++++++++++++
3 files changed, 145 insertions(+)
create mode 100644 rinlink-d603-parent/rinlink-d603-restserver/src/main/java/com/rinlink/d603/controller/IotDeviceController.java
create mode 100644 rinlink-d603-parent/rinlink-d603-restserver/src/main/java/com/rinlink/d603/service/IotDeviceService.java
create mode 100644 rinlink-d603-parent/rinlink-d603-restserver/src/main/java/com/rinlink/d603/service/imp/IotDeviceServiceImpl.java

win7@win7-PC MINGW64 ~/java_project/rinlink-projects (master)
$ git push
Username for ‘https://github.com’: liuwenchao0621
Enumerating objects: 28, done.
Counting objects: 100% (28/28), done.
Delta compression using up to 8 threads
Compressing objects: 100% (13/13), done.
Writing objects: 100% (16/16), 2.16 KiB | 220.00 KiB/s, done.
Total 16 (delta 7), reused 0 (delta 0)
remote: Resolving deltas: 100% (7/7), completed with 6 local objects.
To https://github.com/yhydev/rinlink-projects.git
071b878…3c227d0 master -> master

win7@win7-PC MINGW64 ~/java_project/rinlink-projects (master)
$ git pull
Username for ‘https://github.com’: liuwenchao0621
remote: Enumerating objects: 7, done.
remote: Counting objects: 100% (7/7), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 4 (delta 2), reused 4 (delta 2), pack-reused 0
Unpacking objects: 100% (4/4), done.
From https://github.com/yhydev/rinlink-projects
3c227d0…b6537e5 master -> origin/master
Updating 3c227d0…b6537e5
Fast-forward
rinlink-yangma/pom.xml | 4 +±-
1 file changed, 2 insertions(+), 2 deletions(-)

win7@win7-PC MINGW64 ~/java_project/rinlink-projects (master)
$ ^C

win7@win7-PC MINGW64 ~/java_project/rinlink-projects (d603-restserver)
$ ^C

`**

已标记关键词 清除标记
©️2020 CSDN 皮肤主题: 大白 设计师:CSDN官方博客 返回首页