[student@workstation ~ (master #%)]$ mkdir lxhproject [student@workstation ~ (master #%)]$ cd lxhproject [student@workstation lxhproject (master #%)]$ git init hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch <name> hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m <name> Initialized empty Git repository in /home/student/lxhproject/.git/ [student@workstation lxhproject (master #)]$ ls -a . .. .git
git init –bare：
创建一个服务器端的共享仓库，用于多人协作。
作为中央仓库，接收来自多个开发者的推送。
适合需要集中管理代码的场景。
特性
git init
git init --bare
工作目录
有工作树，用户可以直接编辑文件
无工作树，仅包含 .git 目录
用途
本地开发仓库，适合个人开发
服务器端仓库，适合多人协作和推送
目录结构
包含 .git 目录和工作树
只包含 .git 目录的内容
是否支持直接编辑
支持，用户可以在工作目录中直接修改文件
不支持，所有操作通过命令行完成
是否适合推送
推送时需要指定远程仓库
作为远程仓库，接收来自其他仓库的推送
从下面的示例来看，压根没有隐藏的.git目录，直接就是其内的内容
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
[student@workstation ~ (master #%)]$ mkdir ~/bareproject [student@workstation ~ (master #%)]$ cd ~/bareproject [student@workstation bareproject (master #%)]$ git init --bare hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch <name> hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m <name> Initialized empty Git repository in /home/student/bareproject/
[student@workstation bareproject (BARE:master)]$ ls -a . .. branches config description HEAD hooks info objects refs
[student@workstation develop-git (main)]$ git status On branch main Your branch is ahead of 'origin/main' by 1 commit. (use "git push" to publish your local commits)
nothing to commit, working tree clean [student@workstation develop-git (main)]$ touch lxh-2.txt [student@workstation develop-git (main %)]$ git status On branch main Your branch is ahead of 'origin/main' by 1 commit. (use "git push" to publish your local commits)
Untracked files: (use "git add <file>..." to include in what will be committed) lxh-2.txt
nothing added to commit but untracked files present (use "git add" to track)
[student@workstation develop-git (main %)]$ git rm lixiaohui.txt rm'lixiaohui.txt' [student@workstation develop-git (main +%)]$ ls apache-setup.yml lxh-2.txt templates [student@workstation develop-git (main +%)]$ git status On branch main Your branch is ahead of 'origin/main' by 1 commit. (use "git push" to publish your local commits)
Changes to be committed: (use "git restore --staged <file>..." to unstage) deleted: lixiaohui.txt
[student@workstation develop-git (lxh-branch)]$ git merge lxh-branch Already up to date. [student@workstation develop-git (lxh-branch)]$ git merge main Auto-merging lixiaohui.txt CONFLICT (content): Merge conflict in lixiaohui.txt Automatic merge failed; fix conflicts and then commit the result.
[student@workstation develop-git (lxh-branch *+|MERGING)]$ cat lixiaohui.txt <<<<<<< HEAD lxh-branch content ======= main content >>>>>>> main
[student@workstation develop-git (lxh-branch)]$ git checkout 631bb57dafd8d Note: switching to '631bb57dafd8d'.
You are in'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by switching back to a branch.
If you want to create a new branch to retain commits you create, you may do so (now or later) by using -c with the switch command. Example:
git switch -c <new-branch-name>
Or undo this operation with:
git switch -
Turn off this advice by setting config variable advice.detachedHead to false
HEAD is now at 631bb57 lixiaohui commit ok [student@workstation develop-git ((631bb57...))]$
用checkout -b创建并进入新分支，当然也可以先创建，再checkout
1 2 3 4 5 6
[student@workstation develop-git ((631bb57...))]$ git checkout -b version-1 Switched to a new branch 'version-1' [student@workstation develop-git (version-1)]$ git branch lxh-branch main * version-1
production # inventory file for production servers staging # inventory file for staging environment
group_vars/ group1.yml # here we assign variables to particular groups group2.yml host_vars/ hostname1.yml # here we assign variables to particular systems hostname2.yml
library/ # if any custom modules, put them here (optional) module_utils/ # if any custom module_utils to support modules, put them here (optional) filter_plugins/ # if any custom filter plugins, put them here (optional)
site.yml # main playbook webservers.yml # playbook for webserver tier dbservers.yml # playbook for dbserver tier tasks/ # task files included from playbooks webservers-extra.yml # <-- avoids confusing playbook with task files
