注冊與登錄
創建項目
代碼關聯倉庫
1.git全局設置
$ git config --global user.name "name" $ git config --global user.email "name@qq.com"
2.創建git倉庫
mkdir study cd study touch batch_copy.py git add . git commit -m 'inital'
3. 把git倉庫提交給碼雲
git remote add origin https://gitee.com/XXX/study1.git #給遠程項目起一個別名origin git push -u origin master #把本地項目分支提交到碼雲遠程項目
在使用git 對源代碼進行push到gitHub時可能會出錯，信息如下
出現錯誤的主要原因是碼雲中的README.md文件不在本地代碼目錄中
可以通過如下命令進行代碼合並【注：pull=fetch+merge]
git pull --rebase origin master
執行上面代碼后可以看到本地代碼庫中多了README.md文件
此時再執行語句 git push -u origin master即可完成代碼上傳到碼雲
在碼雲上查看push的代碼
4.建立打碼分支推送到碼雲
MINGW64 ~/PycharmProjects/study (master) $ git branch dev # 創建分支 MINGW64 ~/PycharmProjects/study (master) $ ls 0349.bmp code.png QuickSortTest.py spyPic.py test.html user.py 12306.py codes.py readFile.py* station.py test.log user.pyc batch_copy.py* codes.pyc README.md station.pyc test1.py MINGW64 ~/PycharmProjects/study (master) $ git checkout dev # 切換分支 Switched to branch 'dev' MINGW64 ~/PycharmProjects/study (dev) $ ls 0349.bmp code.png QuickSortTest.py spyPic.py test.html user.py 12306.py codes.py readFile.py* station.py test.log user.pyc batch_copy.py* codes.pyc README.md station.pyc test1.py MINGW64 ~/PycharmProjects/study (dev) $ touch dev.txt MINGW64 ~/PycharmProjects/study (dev) $ git push origin dev # 把分支推送到origin別名的項目地址 Total 0 (delta 0), reused 0 (delta 0) remote: Powered by Gitee.com To https://gitee.com/xxx/study1.git * [new branch] dev -> dev
在代碼倉庫可以看見多了一個分支dev
5.在A地方把代碼clone，更新代碼
MINGW64 ~/PycharmProjects/study2 $ git clone https://gitee.com/xxxi/study1.git #clone Cloning into 'study1'... remote: Enumerating objects: 34, done. remote: Counting objects: 100% (34/34), done. remote: Compressing objects: 100% (32/32), done. remote: Total 34 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (34/34), done. MINGW64 ~/PycharmProjects/study2 $ ls study1/ MINGW64 ~/PycharmProjects/study2 $ cd study1/ MINGW64 ~/PycharmProjects/study2/study1 (master) $ git branch * master #默認只clone master分支代碼 MINGW64 ~/PycharmProjects/study2/study1 (master) $ git branch dev #建立分支dev MINGW64 ~/PycharmProjects/study2/study1 (master) $ git checkout dev #切換分支dev Switched to branch 'dev' MINGW64 ~/PycharmProjects/study2/study1 (dev) $ git pull origin dev #從遠處項目拉取dev分支代碼 From https://gitee.com/XXX/study1 * branch dev -> FETCH_HEAD Already up to date. MINGW64 ~/PycharmProjects/study2/study1 (dev) $ ls 0349.bmp code.png QuickSortTest.py spyPic.py test.html user.py 12306.py codes.py readFile.py* station.py test.log user.pyc batch_copy.py* codes.pyc README.md station.pyc test1.py MINGW64 ~/PycharmProjects/study2/study1 (dev) $ touch a.py #add a.py MINGW64 ~/PycharmProjects/study2/study1 (dev) $ git add . MINGW64 ~/PycharmProjects/study2/study1 (dev) $ git commit -m '在A地提交' [dev 52dcd1a] 在A地提交 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 a.py MINGW64 ~/PycharmProjects/study2/study1 (dev) $ git push origin dev # 在A地方把修改信息推送到遠處dev分支 Counting objects: 3, done. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 272 bytes | 272.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0) remote: Powered by Gitee.com To https://gitee.com/XXX/study1.git 4ddb9df..52dcd1a dev -> dev
6.在B地pull代碼，更新代碼
XXX MINGW64 ~/PycharmProjects/study (dev) $ git pull origin dev # 在B地拉取代碼 remote: Enumerating objects: 4, done. remote: Counting objects: 100% (4/4), done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From https://gitee.com/XXX/study1 * branch dev -> FETCH_HEAD 4ddb9df..52dcd1a dev -> origin/dev Updating 4ddb9df..52dcd1a Fast-forward a.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 a.py XXX MINGW64 ~/PycharmProjects/study (dev) $ ls 0349.bmp code.png QuickSortTest.py station.py test1.py 12306.py codes.py readFile.py* station.pyc user.py a.py codes.pyc README.md test.html user.pyc batch_copy.py* dev.txt spyPic.py test.log XXX MINGW64 ~/PycharmProjects/study (dev) $ cat a.py XXX MINGW64 ~/PycharmProjects/study (dev) $ vim a.py # 修改a.py XXX MINGW64 ~/PycharmProjects/study (dev) $ git add . warning: LF will be replaced by CRLF in a.py. The file will have its original line endings in your working directory. XXX MINGW64 ~/PycharmProjects/study (dev) $ git commit -m '在B地' [dev 92385a0] 在B地 2 files changed, 1 insertion(+) create mode 100644 dev.txt XXX MINGW64 ~/PycharmProjects/study (dev) $ git push origin dev # 在B地方把代碼推送到遠程代碼倉庫 Counting objects: 3, done. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 281 bytes | 281.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0) remote: Powered by Gitee.com To https://gitee.com/XXX/study1.git 52dcd1a..92385a0 dev -> dev
7.查看更改歷史
