mirror of
https://gitee.com/jiuyilian/embedded-framework.git
synced 2025-01-06 10:16:51 -05:00
61 lines
1.8 KiB
Markdown
61 lines
1.8 KiB
Markdown
# 1. git使用手册
|
||
|
||
## 1.1. 概述
|
||
|
||
  git是分布式版本控制系统，在多人开发中，git可以很好的管理代码的版本。
|
||
|
||
## 1.2. 源码托管服务器
|
||
|
||
  github和gitlab还有gitee（国产）都是开源的代码托管服务器，可以用来管理源码。
|
||
|
||
## 1.3. git安装
|
||
|
||
## 1.4. git分支管理
|
||
|
||
### 1.4.1. git创建本地分支
|
||
|
||
* 基于远端分支创建一个本地分支，同时新建一个对应的远端分支：
|
||
|
||
  当主干发生较大变化，例如：原厂更新sdk时，需要新建分支，划分界限。
|
||
|
||
```
|
||
$ git branch -a
|
||
* master
|
||
remotes/origin/HEAD -> origin/master
|
||
remotes/origin/app_test
|
||
remotes/origin/master
|
||
$ git checkout -b master-sdk-202405 origin/master
|
||
M ipc-sdk
|
||
Branch 'master-sdk-202405' set up to track remote branch 'master' from 'origin'.
|
||
Switched to a new branch 'master-sdk-202405'
|
||
$ git branch -a
|
||
master
|
||
* master-sdk-202405
|
||
remotes/origin/HEAD -> origin/master
|
||
remotes/origin/app_test
|
||
remotes/origin/master
|
||
$ git push origin master-sdk-202405:sdk-202405
|
||
Enumerating objects: 3, done.
|
||
Counting objects: 100% (3/3), done.
|
||
Delta compression using up to 8 threads
|
||
Compressing objects: 100% (2/2), done.
|
||
Writing objects: 100% (2/2), 250 bytes | 250.00 KiB/s, done.
|
||
Total 2 (delta 1), reused 0 (delta 0)
|
||
remote: Powered by GITEE.COM [GNK-6.4]
|
||
remote: Create a pull request for 'sdk-202405' on Gitee by visiting:
|
||
remote: https://gitee.com/shenzhen-jiuyilian/ipc-rk1106/pull/new/shenzhen-jiuyilian:sdk-202405...shenzhen-jiuyilian:master
|
||
To gitee.com:shenzhen-jiuyilian/ipc-rk1106.git
|
||
* [new branch] master-sdk-202405 -> sdk-202405
|
||
$ git branch -a
|
||
master
|
||
* master-sdk-202405
|
||
remotes/origin/HEAD -> origin/master
|
||
remotes/origin/app_test
|
||
remotes/origin/master
|
||
remotes/origin/sdk-202405
|
||
```
|
||
|
||
## 1.5. 存疑
|
||
|
||
* 不同的分支之间如何同步某个文件？
|