1.子分支
$ git status
位于分支 base
无文件要提交，干净的工作区
2.子分支更新
$ git pull origin base
来自 http://106.14.59.204/jiqing/baseadmin
* branch base -> FETCH_HEAD
Already up-to-date.
3.子分支提交
$ lazygit.sh 微调
[base c987a22] 微调
3 files changed, 73 insertions(+)
rename Api/Conf/{config.php.example => config_example.php} (100%)
rename Cron/Conf/{config.php.example => config_example.php} (100%)
create mode 100755 sh/init.sh
对象计数中: 8, 完成.
Delta compression using up to 4 threads.
压缩对象中: 100% (5/5), 完成.
写入对象中: 100% (8/8), 1.04 KiB | 0 bytes/s, 完成.
Total 8 (delta 1), reused 0 (delta 0)
remote:
remote: To create a merge request for base, visit:
remote: http://106.14.59.204/jiqing/baseadmin/merge_requests/new?merge_request%5Bsource_branch%5D=base
remote:
To http://106.14.59.204/jiqing/baseadmin.git
48a5f24..c987a22 base -> base
4.切换到主分支
$ git checkout master
切换到分支 'master'
您的分支与上游分支 'origin/master' 一致。
5.合并子分支
$ git merge base
更新 48a5f24..c987a22
Fast-forward
Api/Conf/{config.php.example => config_example.php} | 0
Cron/Conf/{config.php.example => config_example.php} | 0
sh/init.sh | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 73 insertions(+)
rename Api/Conf/{config.php.example => config_example.php} (100%)
rename Cron/Conf/{config.php.example => config_example.php} (100%)
create mode 100755 sh/init.sh