会在初始化后的目录中生成一个.git隐藏文件夹

$ workspace % cd .git$ .git % lsHEAD		branches	config		description	hooks		info		objects		refs$ .git % ls -ltotal 24-rw-r--r--   1 jack  staff   23 Sep 25 22:16 HEADdrwxr-xr-x   2 jack  staff   64 Sep 25 22:16 branches-rw-r--r--   1 jack  staff  137 Sep 25 22:16 config-rw-r--r--   1 jack  staff   73 Sep 25 22:16 descriptiondrwxr-xr-x  13 jack  staff  416 Sep 25 22:16 hooksdrwxr-xr-x   3 jack  staff   96 Sep 25 22:16 infodrwxr-xr-x   4 jack  staff  128 Sep 25 22:16 objectsdrwxr-xr-x   4 jack  staff  128 Sep 25 22:16 refs$ .git % 

注意：.git目录中的文件不要删除也不要修改，否则git不能正常工作。

设置签名形式

用户名：XXX

Email地址：XXX@gmail.com作用

只是为了区分成员身份，不会给邮件地址发送邮件。而且邮件地址可以是不存在地址。注意

这里的签名和远程仓库的邮件地址密码没有任何关系命令

1.项目级别/仓库级别

仅在当前本地仓库有效

git config user.name 用户名

git config user.email 邮箱地址$ WebService % git config user.name njzy $ WebService % git config user.email njzy@2020.com $ WebService % 2.系统用户级别

登录当前系统的用户范围

git config --global user.name 用户名

git config --global user.email 邮箱地址$ WebService % git config --global user.name njzy_global $ WebService % git config --global user.email njzy_global@2020.com $ WebService %签名保存位置

1.项目级别

当前项目下的.git文件夹下的config文件中。

查看命令：cat .git/config$ WebService % cat .git/config //查看当前项目的签名信息 [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true ignorecase = true precomposeunicode = true [user] name = njzy //被设置的项目用户名 email = njzy@2020.com //被设置的项目邮件地址 $ WebService % 2.系统用户级别

当前用户文件夹下的.gitconfig文件中。

查看命令：cat .gitconfig$ ~ % cd ~ //切换到当前用户根目录 $ ~ % pwd //查看当前位置 /Users/jack $ ~ % cat .gitconfig //查看全局签名信息 [user] name = njzy_global //被设置的全局用户名 email = njzy_global@2020.com //被设置的全局邮件地址 $ ~ %项目级别和系统用户级别的签名的优先（就近原则）

1.> 两个都设置情况下

项目级别优先于系统用户级别

2.> 只设定系统用户级别签名

以系统用户级签名别为准

3.> 只设定项目级别

以项目级别为准

4.> 两个都没有设定的话不允许。查看git状态作用

确认git的暂存区，本地仓库的情况。命令

git status添加操作目的

把内容从工作区添加到暂存区，也叫追踪。命令

1.添加单个文件

git add 文件名

2.添加多个文件

1.> git add 文件名1 文件名2 文件名3 ....

2.> git add -A

3.> git add .

详细参考git帮助文档usage: git add [<options>] [--] <pathspec>... -n, --dry-run dry run -v, --verbose be verbose -i, --interactive interactive picking -p, --patch select hunks interactively -e, --edit edit current diff and apply -f, --force allow adding otherwise ignored files -u, --update update tracked files //更新追踪的文件 --renormalize renormalize EOL of tracked files (implies -u) -N, --intent-to-add record only the fact that the path will be added later -A, --all add changes from all tracked and untracked files //添加所有被追踪文件的更新，和没有被追踪的文件 --ignore-removal ignore paths removed in the working tree (same as --no-all) //忽略工作区被删除的文件 --refresh don't add, only refresh the index --ignore-errors just skip files which cannot be added because of errors //忽略由于文件的错误不能被追踪 --ignore-missing check if - even missing - files are ignored in dry run --chmod (+|-)x override the executable bit of the listed files使用例

为了清除git各个阶段的状态，在进行添加操作之前先查看一下git的状态。

(下面例子是从工作区文件的创建到追加暂存区的过程)

1.查看工作区被初始化后的状态$ WebService % git status On branch master No commits yet //本地仓库没有可提交的东西 nothing to commit (create/copy files and use "git add" to track) //暂存区没有可以提交的东西 $ WebService % 2.创建文件testGIt.txt文件$ WebService % vim testGit.txt $ WebService % cat testGit.txt //查看文件内容 hello ! this is my first git test file ! $ WebService % 3.查看文件创建完后git状态$ WebService % git status On branch master No commits yet //本地仓库没有乐意提交的东西。 Untracked files: //没有追加跟踪的文件 (use "git add <file>..." to include in what will be committed) //使用git add <file> 命令可以追加文件到暂存区 testGit.txt //刚才新创建的文件，此时文件名字体为红色 nothing added to commit but untracked files present (use "git add" to track) //使用git add命令 $ WebService % 4.将文件添加到暂存区并查看状态$ WebService % git add testGit.txt $ WebService % git status On branch master No commits yet Changes to be committed: (use "git rm --cached <file>..." to unstage) //已经把文件放到暂存区，如果想清除暂存区，可以使用git rm --cached 文件名来擦除暂存区 testGit.txt new file: testGit.txt //此时文件为绿色 $ WebService %提交操作目的

将文件从暂存区提交到本地仓库命令

1.提交单个文件

git commit -m "提交时注释信息" 文件名

2.提交复数个文件

git comit -a -m "提交时注释信息"

更多详细可以参考git帮助文档usage: git commit [<options>] [--] <pathspec>... -q, --quiet suppress summary after successful commit -v, --verbose show diff in commit message template Commit message options -F, --file <file> read message from file --author <author> override author for commit --date <date> override date for commit -m, --message <message> commit message -c, --reedit-message <commit> reuse and edit message from specified commit -C, --reuse-message <commit> reuse message from specified commit --fixup <commit> use autosquash formatted message to fixup specified commit --squash <commit> use autosquash formatted message to squash specified commit --reset-author the commit is authored by me now (used with -C/-c/--amend) -s, --signoff add Signed-off-by: -t, --template <file> use specified template file -e, --edit force edit of commit --cleanup <mode> how to strip spaces and #comments from message --status include status in commit message template -S, --gpg-sign[=<key-id>] GPG sign commit Commit contents options -a, --all commit all changed files -i, --include add specified files to index for commit --interactive interactively add files -p, --patch interactively add changes -o, --only commit only specified files -n, --no-verify bypass pre-commit and commit-msg hooks --dry-run show what would be committed --short show status concisely --branch show branch information --ahead-behind compute full ahead/behind values --porcelain machine-readable output --long show status in long format (default) -z, --null terminate entries with NUL --amend amend previous commit --no-post-rewrite bypass post-rewrite hook -u, --untracked-files[=<mode>] show untracked files, optional modes: all, normal, no. (Default: all)使用例

提交文件到本地仓库并查看git状态$ WebService % git commit -m "first commit:new file testGit.txt" testGit.txt [master (root-commit) c970a17] first commit:new file testGit.txt //first commit:new file testGit.txt 是提交时候的注释信息 1 file changed, 2 insertions(+) //改变了一个文件，追加了两行信息。 create mode 100644 testGit.txt $ WebService % git status On branch master nothing to commit, working tree clean //暂存区没有可以提交的东西 $ WebService %擦除暂存区操作目的

擦除暂存区的内容命令

git rm --cached 文件名$ WebService % git rm --cached testGit.txt rm 'testGit.txt' $ WebService % git status On branch master No commits yet Untracked files: (use "git add <file>..." to include in what will be committed) testGit.txt //没有被追踪的文件 nothing added to commit but untracked files present (use "git add" to track) $ WebService %查看历史版本信息目的

查看提交版本的历史信息命令

1.git log

显示完整信息，包含提交的版本号，提交用户，提交日期，提交注释等信息。

2.git log --pretty=oneline

只包含提交后的完整版本号和提交时的注释信息

3.git log --oneline

包含提交后的简略版本号和提交时的注释信息注意

只能查看已经被提交（commit）的文件的历史信息。使用例1$ WebService % git log //第二次被提交的信息 commit 148942fd3c0ff3e01e09bf98d883f97a3b0a9c86 (HEAD -> master) //提交版本的hash值 Author: njzy <njzy@2020.com> //提交用户信息 Date: Sat Sep 26 15:53:52 2020 +0900 //提交日期 this is my second commit, modify testGit.txt //提交时注释 //第一次被提交的信息 commit c970a176de13abc4d436e4a08df329046ef193e7 Author: njzy <njzy@2020.com> Date: Sat Sep 26 12:30:20 2020 +0900 first commit:new file testGit.txt $ WebService %使用例2$ WebService % git log --pretty=oneline 148942fd3c0ff3e01e09bf98d883f97a3b0a9c86 (HEAD -> master) this is my second commit, modify testGit.txt c970a176de13abc4d436e4a08df329046ef193e7 first commit:new file testGit.txt $ WebService %使用例3$ WebService % git log --oneline 148942f (HEAD -> master) this is my second commit, modify testGit.txt c970a17 first commit:new file testGit.txt $ WebService %历史版本的前进或者回退查看带head信息的日志目的

查看带有指针和hash地址的日志信息，方便进行版本的前进或者后退。命令

git reflog使用例$ WebService % git reflog 148942f (HEAD -> master) HEAD@{0}: commit: this is my second commit, modify testGit.txt //148942f:简短的hash地址 //HEAD@{0}:指针0的位置 c970a17 HEAD@{1}: commit (initial): first commit:new file testGit.txt //HEAD@{1} 指针1的位置 $ WebService %版本的前进或者和回退基于hash地址的版本指定【推荐】目的

对版本进行前进操作或者回退操作命令

git reset --hard 指定版本的hash地址使用例

从第五个版本跳转到第三个版本$ WebService % git reflog //首先查看各种版本信息 d3c9608 (HEAD -> master) HEAD@{0}: commit: this is my fifth updata,updata testGit.txt 364024e HEAD@{1}: commit: this is my fourth commit,updata testGit.txt 9dba7c5 HEAD@{2}: commit: this is my third commit,updata testGit.txt 148942f HEAD@{3}: commit: this is my second commit, modify testGit.txt c970a17 HEAD@{4}: commit (initial): first commit:new file testGit.txt $ WebService % cat testGit.txt //查看当前版本的文件内容 hello ! this is my first git test file ! this is added this is my third updata! this is my four updata! this is my fifth updata! $ WebService % git reset --hard 9dba7c5 //然后根据查看的版本地址信息，指定到要恢复到的版本。 HEAD is now at 9dba7c5 this is my third commit,updata testGit.txt $ WebService % cat testGit.txt //然后查看回退后的当前版本文件内容 hello ! this is my first git test file ! this is added this is my third updata! $ WebService % git reflog //然后我们再来看一下log信息 9dba7c5 (HEAD -> master) HEAD@{0}: reset: moving to 9dba7c5 d3c9608 HEAD@{1}: commit: this is my fifth updata,updata testGit.txt 364024e HEAD@{2}: commit: this is my fourth commit,updata testGit.txt 9dba7c5 (HEAD -> master) HEAD@{3}: commit: this is my third commit,updata testGit.txt 148942f HEAD@{4}: commit: this is my second commit, modify testGit.txt c970a17 HEAD@{5}: commit (initial): first commit:new file testGit.txt $ WebService %使用^符号（只能进行版本的后退不能前进）目的

进行版本的回退命令

git reset --hard HEAD^

(注意：一个^代表倒退一个版本)使用例

从第四个版本倒退到一个版本到第三个版本$ WebService % git reset --hard HEAD^ HEAD is now at 9dba7c5 this is my third commit,updata testGit.txt $ WebService % cat testGit.txt hello ! this is my first git test file ! this is added this is my third updata! $ WebService % 倒退两个版本$ WebService % git reset --hard HEAD^^ HEAD is now at c970a17 first commit:new file testGit.txt $ WebService % cat testGit.txt hello ! this is my first git test file ! $ WebService %使用~符号目的

退回指定版本

（只能倒退，但是可以指定指定退几步）命令

git reset --hard HEAD~要退的步数使用例

从当前版本第五版后退两步到第三个版本$ WebService % git reset --hard HEAD~2 HEAD is now at 9dba7c5 this is my third commit,updata testGit.txt $ WebService % cat testGit.txt hello ! this is my first git test file ! this is added this is my third updata! $ WebService %reset三个参数的对比--soft参数示意图

说明

仅在本地仓库移动HEAD指针命令

git reset -soft 指定版本号使用例$ WebService % cat testGit.txt //退回版本之前查看文件内容 hello ! this is my first git test file ! this is added this is my third updata! $ WebService % git reset --soft 148942f //退回版本操作 $ WebService % cat testGit.txt //退回版本信息后查看文件内容 hello ! this is my first git test file ! this is added this is my third updata! $ WebService % git status //查看状态 On branch master Changes to be committed: (use "git restore --staged <file>..." to unstage) modified: testGit.txt //查看完后显示为绿色字体，表示被更改了。为哈如此呢？ //是由于原来本地仓库，暂存区，工作区的指针是相同的。而经过soft操作后，本地仓库的指针发生变化，导致暂存区的指针相对的产生了变化。所以显示是发生了变化。 $ WebService %--mixd参数示意图

说明

在本地仓库移动HEAD指针，重置暂存区。命令

git reset --mixed 指定版本号使用例$ WebService % cat testGit.txt //跳转到其他版本之前文件内容 hello ! this is my first git test file ! this is added this is my third updata! $ WebService % git reset --mixed d3c9608 //指定到指定版本 Unstaged changes after reset: M testGit.txt $ WebService % git reflog //指定版本后的日志 d3c9608 (HEAD -> master) HEAD@{0}: reset: moving to d3c9608 148942f HEAD@{1}: reset: moving to 148942f 9dba7c5 HEAD@{2}: reset: moving to HEAD~2 d3c9608 (HEAD -> master) HEAD@{3}: reset: moving to d3c9608 c970a17 HEAD@{4}: reset: moving to HEAD^^ 9dba7c5 HEAD@{5}: reset: moving to HEAD^ 364024e HEAD@{6}: reset: moving to 364024e 9dba7c5 HEAD@{7}: reset: moving to 9dba7c5 d3c9608 (HEAD -> master) HEAD@{8}: commit: this is my fifth updata,updata testGit.txt 364024e HEAD@{9}: commit: this is my fourth commit,updata testGit.txt 9dba7c5 HEAD@{10}: commit: this is my third commit,updata testGit.txt 148942f HEAD@{11}: commit: this is my second commit, modify testGit.txt c970a17 HEAD@{12}: commit (initial): first commit:new file testGit.txt $ WebService % cat testGit.txt //查看切换版本后的文件内容 hello ! this is my first git test file ! this is added this is my third updata! $ WebService % git status On branch master Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) modified: testGit.txt //此时文件名是红色 no changes added to commit (use "git add" and/or "git commit -a") $ WebService %--hard参数示意图

说明

在本地仓库移动HEAD指针

重置暂存区

重置工作区命令

git reset --hard 指定版本使用例

参照上面各种版本前进或者后退的例子。删除文件并找回示意图

前提

提交到本地库后删除才能找回删除

物理删除即可找回版本

通过跳转到指定版本命令即可找回删除的内容。使用例

新建文件->追加到暂存区->提交到本地仓库->删除文件->添加到暂存区->提交到本地仓库$ WebService % vim test2.txt //1.创建一个新的测试文件 $ WebService % git add test2.txt //2.添加到暂存区 $ WebService % git commit -m "add new test2.txt" test2.txt //3.提交到本地仓库 [master 8a4e57d] add new test2.txt 1 file changed, 3 insertions(+) create mode 100644 test2.txt $ WebService % ls -l //查看当前文件夹文件 total 16 -rw-r--r-- 1 jack staff 27 Sep 27 07:11 test2.txt -rw-r--r-- 1 jack staff 134 Sep 26 22:33 testGit.txt $ WebService % git status //查看git状态 On branch master nothing to commit, working tree clean $ WebService % $ WebService % $ WebService % $ WebService % rm test2.txt //4.本地物理删除文件 $ WebService % ls -l //5.删除后确认 total 8 -rw-r--r-- 1 jack staff 134 Sep 26 22:33 testGit.txt $ WebService % git status //6.查看删除后 On branch master Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) deleted: test2.txt //红色字体，表示这个操作没有被添加到暂存区 no changes added to commit (use "git add" and/or "git commit -a") $ WebService % git add test2.txt //7.将删除后的状态添加到暂存区 $ WebService % git status //查看添加后的git状态 On branch master Changes to be committed: (use "git restore --staged <file>..." to unstage) deleted: test2.txt //文字为绿色，表示暂存区已被更新。 $ WebService % git commit -m "delete file test2.txt" test2.txt //8.把暂存区内容提交到本地仓库 [master f8373c4] delete file test2.txt 1 file changed, 3 deletions(-) delete mode 100644 test2.txt $ WebService % git status //查看git状态 On branch master nothing to commit, working tree clean $ WebService % ls testGit.txt $ WebService % git reflog //9.查看日志信息 f8373c4 (HEAD -> master) HEAD@{0}: commit: delete file test2.txt //10/1文件被删除的历史记录 8a4e57d HEAD@{1}: commit: add new test2.txt d3c9608 HEAD@{2}: reset: moving to d3c9608 d3c9608 HEAD@{3}: reset: moving to d3c9608 148942f HEAD@{4}: reset: moving to 148942f 9dba7c5 HEAD@{5}: reset: moving to HEAD~2 d3c9608 HEAD@{6}: reset: moving to d3c9608 c970a17 HEAD@{7}: reset: moving to HEAD^^ 9dba7c5 HEAD@{8}: reset: moving to HEAD^ 364024e HEAD@{9}: reset: moving to 364024e 9dba7c5 HEAD@{10}: reset: moving to 9dba7c5 d3c9608 HEAD@{11}: commit: this is my fifth updata,updata testGit.txt 364024e HEAD@{12}: commit: this is my fourth commit,updata testGit.txt 9dba7c5 HEAD@{13}: commit: this is my third commit,updata testGit.txt 148942f HEAD@{14}: commit: this is my second commit, modify testGit.txt c970a17 HEAD@{15}: commit (initial): first commit:new file testGit.txt $ WebService % git reset --hard 8a4e57d //2.恢复到删除之前的版本 HEAD is now at 8a4e57d add new test2.txt $ WebService % ls -l//3.查看本地文件是否恢复？ total 16 -rw-r--r-- 1 jack staff 27 Sep 27 07:25 test2.txt//文件又被恢复回来了 -rw-r--r-- 1 jack staff 134 Sep 26 22:33 testGit.txt $ WebService %恢复暂存区的文件说明

使暂存区文件恢复命令

git reset --hard HEAD

通过上面刷新让三个区保持一致即可条件

要恢复的文件提交到了本地库版本比较比较工作区和暂存区命令

git diff 文件名使用例

比较修改后的test2.txt的工作区和暂存区

工作区，暂存区，本地仓库test2.txt内容一致aaaaaaaa bbbbbbbb cccccccc 修改后的工作区test2.txtaaaaaaaa bbbbbbbb cccccccc@@@@@@ 比较后结果$ WebService % git diff test2.txt diff --git a/test2.txt b/test2.txt index 092b923..0c08686 100644 --- a/test2.txt +++ b/test2.txt @@ -1,3 +1,3 @@ aaaaaaaa bbbbbbbb -cccccccc //-代表删除 +cccccccc@@@@@@ //+代表追加。git是以行为单位来管理版本的，所以cccccccc表示为删除，cccccccc@@@@@@表示为追加。 $ WebService % 提交到暂存区后再比较$ WebService % git add test2.txt $ WebService % git diff test2.txt $ WebService %工作区和本地仓库版本比较命令

git diff 指定版本 [文件名]指定版本

HEAD：当前本地仓库的版本

HEAD^:本地仓库的上一个版本

HEAD^^：本地仓库的上两个版本

HEAD~n：本地仓库的上n个版本

版本号的hash值注意

文件名不写的话是所有当前文件夹的所有文件使用例

工作区和本地仓库的当前版本比较$ WebService % git reset --hard HEAD //先把三个区同步一下，恢复到同一状态 HEAD is now at 8a4e57d add new test2.txt $ WebService % git status On branch master nothing to commit, working tree clean $ WebService % cat test2.txt aaaaaaaa bbbbbbbb cccccccc $ WebService % vim test2.txt //对工作区修改 $ WebService % git diff HEAD test2.txt//修改后进行比较 diff --git a/test2.txt b/test2.txt index 092b923..0c08686 100644 --- a/test2.txt +++ b/test2.txt @@ -1,3 +1,3 @@ aaaaaaaa bbbbbbbb -cccccccc +cccccccc@@@@@@ $ WebService % 和本地仓库的上一个版本进行比较$ WebService % git diff HEAD^ test2.txt diff --git a/test2.txt b/test2.txt new file mode 100644 index 0000000..0c08686 --- /dev/null +++ b/test2.txt @@ -0,0 +1,3 @@ +aaaaaaaa +bbbbbbbb +cccccccc@@@@@@ $ WebService %分支分支概述

 在版本控制过程中，使用多条线同时推进多个任务。

git branch 分支名使用例$ WebService % git branch hot_fix查看分支命令

git branch -v使用例$ WebService % git branch -v hot_fix 8a4e57d add new test2.txt * master 8a4e57d add new test2.txt //*所在的位值就是我们现在所以在的分支 $ WebService %切换分支说明

把分支从当前分支切换到其他分支命令

git checkout 分支名使用例$ WebService % git checkout hot_fix Switched to branch 'hot_fix' $ WebService % git branch -v * hot_fix 8a4e57d add new test2.txt //现在已经切换到hot_fix分支 master 8a4e57d add new test2.txt $ WebService %合并分支说明

把指定分支的内容合并到当前分支命令

git merge 要合并内容的分支名$ WebService % git branch -v //查看当前分支 * hot_fix a360edf hox_fix one add master 8a4e57d add new test2.txt $ WebService % git checkout master //切换到内容要合并到的分支 Switched to branch 'master' $ WebService % git branch -v //再次确认切换后的分支 hot_fix a360edf hox_fix one add * master 8a4e57d add new test2.txt $ WebService % git merge hot_fix //进行分支合并 Updating 8a4e57d..a360edf Fast-forward test2.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) $ WebService % cat test2.txt//查看合并后的内容 aaaaaaaa bbbbbbbb cccccccc edit by hox_fix//次内容是hot_fix分支内容，证明已经合并成功。 $ WebService % git branch -v hot_fix a360edf hox_fix one add //当两个分支内容一样的时候，此时两个分支的hash值是一样的。 * master a360edf hox_fix one add //当两个分支内容一样的时候，此时两个分支的hash值是一样的。 $ WebService %解决合并冲突说明

当要合并两个分支的时候，两个分支修改内容不一样，导致不能自动进行合并操作，所以需要手动进行合并操作。解决思路

1.删除冲突文件内容的特殊符号

2.修改冲突内容

3.修改后的文件添加到暂存区。（git add 文件名）

4.从暂存区提交到本地仓库。

（命令：git commit -m "注释"） 注：这里的commit命令不能带文件名称参数。$ WebService % vim test2.txt //修改mster分支的test2文件 $ WebService % git add test2.txt //把修改后的文件添加到暂存区 $ WebService % git commit test2.txt //把暂存区文件提交到本地仓库 [master 4a902f1] updata master 1 file changed, 1 insertion(+) $ WebService % git branch -v //查看当前分支 hot_fix a360edf hox_fix one add * master 4a902f1 updata master $ WebService % $ WebService % git checkout hot_fix //切换到hot_fix分支 Switched to branch 'hot_fix' $ WebService % git branch -v //查看分支 * hot_fix a360edf hox_fix one add master 4a902f1 updata master $ WebService % vim test2.txt //编辑test2.txt $ WebService % git add test2.txt //修改后的文件添加到暂存区 $ WebService % git commit -m "updata hox_fix" test2.txt //提交文件到本地仓库 [hot_fix ee3ae4c] updata hox_fix 1 file changed, 1 insertion(+) $ WebService % $ WebService % git merge master //合并分支 Auto-merging test2.txt CONFLICT (content): Merge conflict in test2.txt Automatic merge failed; fix conflicts and then commit the result. //自动合并分支失败，接下来需要手动修改文件后再进行提交来解决冲突 $ WebService % ls -l total 16 -rw-r--r-- 1 jack staff 126 Sep 27 11:02 test2.txt -rw-r--r-- 1 jack staff 134 Sep 26 22:33 testGit.txt $ WebService % vim test2.txt //打开文件进行手动合并文件内容 $ WebService % git status //查看git状态 On branch hot_fix //在hot_fix分支上 You have unmerged paths.//没有合并的路径 (fix conflicts and run "git commit") //修理冲突并执行 (use "git merge --abort" to abort the merge) //终止合并 Unmerged paths: (use "git add <file>..." to mark resolution) //使用git add <file> 命令去标记为解决 both modified: test2.txt no changes added to commit (use "git add" and/or "git commit -a") $ WebService % git add test2.txt //解决冲突后的文件添加到暂存区 $ WebService % git status On branch hot_fix All conflicts fixed but you are still merging.//所有的冲突已经解决了，但是你仍然处于“合并中”状态。 (use "git commit" to conclude merge) //使用git commit 命令去变换”合并中“的状态 Changes to be committed: modified: test2.txt $ WebService % git commit -m "resolve conflict" test2.txt fatal: cannot do a partial commit during a merge. //注意：在这种特殊场合下的commit不能在后面使用文件名 $ WebService % git commit -m "resolve conflict" //去掉文件名再次执行提交。 [hot_fix 0d62477] resolve conflict //冲突解决了。 $ WebService % git status //查看git状态 On branch hot_fix nothing to commit, working tree clean $ WebService % vim test2.txt //确认合并后的内容 $ WebService % 上面执行完merge命令后，test2.txt文件的内容，aaaaaaaa bbbbbbbb cccccccc edit by hox_fix <<<<<<< HEAD //指针版本内容 eeeeeeee add by hox_fix ======= dddddddd add by master >>>>>>> master //master版本内容 上面修改后的文件内容aaaaaaaa bbbbbbbb cccccccc edit by hox_fix dddddddd add by master eeeeeeee add by hox_fix远程库操作注册账户注册github账户注册码云账户两个账户任意一个即可创建项目仓库创建新仓库

（在这里不做叙述）远程仓库别名设定说明

起别名的目的为了在推送到远程仓库的时候比较简单，不至于敲很长的地址。命令

git remote add 别名 远程仓库地址.git使用例$ WebService % git remote add origin $ WebService %查看远程仓库排名信息说明

在设定远程仓库别名后，查看设定是否成功。命令

git remote -v使用例$ WebService % git remote -v origin https://github.com/jack2019/WebService.git (fetch) origin https://github.com/jack2019/WebService.git (push) $ WebService %推送到远程仓库说明

把本地仓库的内容上传到远程仓库命令

git push 远程库别名 分支名使用例$ WebService % git push origin hot_fix Enumerating objects: 30, done. Counting objects: 100% (30/30), done. Delta compression using up to 16 threads Compressing objects: 100% (22/22), done. Writing objects: 100% (30/30), 2.52 KiB | 1.26 MiB/s, done. Total 30 (delta 4), reused 0 (delta 0) remote: Resolving deltas: 100% (4/4), done. remote: remote: Create a pull request for 'hot_fix' on GitHub by visiting: remote: https://github.com/jack2019/WebService/pull/new/hot_fix remote: To https://github.com/jack2019/WebService.git * [new branch] hot_fix -> hot_fix $ WebService %推送发生失败当推送到远程仓库时莫名发生失败，此时可以进行强行推送命令

git push 远程仓库名称.git 分支名 -f使用例$ WebService % git push origin master //首次推送 To ! [rejected] master -> master (fetch first) error: failed to push some refs to '; //推送失败 hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g., 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. $ WebService % git push origin master -f //进行强行推送 Total 0 (delta 0), reused 0 (delta 0) To + 6cfbddc...4a902f1 master -> master (forced update) //强行推送成功，可以去github仓库查看是否已经有上传的内容。 $ WebService %远程仓库克隆说明

当我们想从github或者码云下载他人的项目进行学习阅读的时候，我们可以使用克隆命令。命令

git clone 远程仓库地址注意

克隆操作在完成下载文件到本地的同时还完成了两件事情。分别是初始化远程仓库别名，初始化本地仓库（也就是git init命令执行过程。）使用例➜ IdeaProjects git clone https://github.com/jack2019/gitLearnning.git //克隆远程仓库库 Cloning into 'gitLearnning'... remote: Enumerating objects: 52, done. remote: Counting objects: 100% (52/52), done. remote: Compressing objects: 100% (34/34), done. remote: Total 52 (delta 10), reused 51 (delta 10), pack-reused 0 Unpacking objects: 100% (52/52), done. //克隆成功 ➜ IdeaProjects cd gitLearnning //进入下载的文件夹 ➜ gitLearnning git:(master) ls -al //查看下载的文件 total 16 drwxr-xr-x 5 jack staff 160 Oct 6 21:34 . drwxr-xr-x@ 21 jack staff 672 Oct 6 21:34 .. drwxr-xr-x 13 jack staff 416 Oct 6 21:34 .git -rw-r--r-- 1 jack staff 219 Oct 6 21:34 test2.txt -rw-r--r-- 1 jack staff 134 Oct 6 21:34 testGit.txt ➜ gitLearnning git:(master) git status //查看git状态 On branch master Your branch is up to date with 'origin/master'. //被下载到了origin/master下 nothing to commit, working tree clean ➜ gitLearnning git:(master)从远程库拉取最新的内容fetch操作说明

远程库的内容被更新后，我们想取得最新的版本的，这时候就用到了fetch命令。如果我们还想和本地的版本进行合并。我们还需要使用merge命令进行合并。命令

git fetch 远程仓库别名 分支名使用例 $ git fetch origin master //抓取内容 remote: Enumerating objects: 5, done. remote: Counting objects: 100% (5/5), done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 1), reused 3 (delta 1), pack-reused 0 Unpacking objects: 100% (3/3), done. From https://github.com/jack2019/WebService * branch master -> FETCH_HEAD f1a3142..da6a4ee master -> origin/master Window-PC MINGW64 /e/workspace/web/webservice (master) $ ls -l total 2 -rw-r--r-- 1 laofan 197121 100 九月 28 21:30 test2.txt -rw-r--r-- 1 laofan 197121 144 九月 28 21:30 testGit.txt Window-PC MINGW64 /e/workspace/web/webservice (master) $ cat test2.txt aaaaaaaa bbbbbbbb cccccccc edit by hox_fix dddddddd add by master mmmmmmm push after updata! Window-PC MINGW64 /e/workspace/web/webservice (master) $ git checkout origin/master //fetch下来的内容放在origin/master下，切换分支到origin、master下。 Note: checking out 'origin/master'. 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 performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b <new-branch-name> HEAD is now at da6a4ee... mac commit ,window fetch Window-PC MINGW64 /e/workspace/web/webservice ((da6a4ee...)) $ git branch -v //查看当前分支 * (HEAD detached at origin/master) da6a4ee mac commit ,window fetch master f1a3142 [behind 1] push after updata test2.txt //当前所处的分支是origin/master下 Window-PC MINGW64 /e/workspace/web/webservice ((da6a4ee...)) $ cat test2.txt //查看当前分支下的文件内容 aaaaaaaa bbbbbbbb cccccccc edit by hox_fix dddddddd add by master mmmmmmm push after updata nnnnnnn macbook add! //当前分支新追加的内容 Window-PC MINGW64 /e/workspace/web/webservice ((da6a4ee...)) $ git checkout master //切换分支到master Previous HEAD position was da6a4ee... mac commit ,window fetch Switched to branch 'master' Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded. (use "git pull" to update your local branch) Window-PC MINGW64 /e/workspace/web/webservice (master) $ git branch -v //查看当前分支 * master f1a3142 [behind 1] push after updata test2.txt Window-PC MINGW64 /e/workspace/web/webservice (master) $ cat test2.txt //查看当前分支内容 aaaaaaaa bbbbbbbb cccccccc edit by hox_fix dddddddd add by master mmmmmmm push after updata! Window-PC MINGW64 /e/workspace/web/webservice (master) $ git merge origin/master //把origin/master分支内容合并到master Updating f1a3142..da6a4ee Fast-forward test2.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Window-PC MINGW64 /e/workspace/web/webservice (master) $ cat test2.txt //查看合并后的master分支文件内容 aaaaaaaa bbbbbbbb cccccccc edit by hox_fix dddddddd add by master mmmmmmm push after updata nnnnnnn macbook add! //origin/master追加的内容 Window-PC MINGW64 /e/workspace/web/webservice (master)pull操作说明

pull操作等价于fetch操作 + merge操作命令

git pull 远程仓库别名 分支名使用例$ git pull origin master remote: Enumerating objects: 5, done. remote: Counting objects: 100% (5/5), done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 1), reused 3 (delta 1), pack-reused 0 Unpacking objects: 100% (3/3), done. From https://github.com/jack2019/WebService * branch master -> FETCH_HEAD da6a4ee..494ed55 master -> origin/master Updating da6a4ee..494ed55 Fast-forward test2.txt | 1 + 1 file changed, 1 insertion(+) Window-PC MINGW64 /e/workspace/web/webservice (master) $ cat test2.txt aaaaaaaa bbbbbbbb cccccccc edit by hox_fix dddddddd add by master mmmmmmm push after updata nnnnnnn macbook add! jjjjjjj macbook add2! Window-PC MINGW64 /e/workspace/web/webservice (master) $协同开发冲突的解决说明

如果不基于远程库最新版本进行修改的话则不能推送，必须先拉取最新的远程库。拉取后发生冲突，则按照“分支冲突解决”的操作即可。例子

mac端更新后提交github

window端不拉取最新的github直接更新进行提交github。此时需要先拉取最新的远程库进行，并进行远程库和本地库的合并。跨团队协作说明

当需要团队外部的人员进行代码的变更时，由于团队外的人没有push的权限，所以需要团队外人员对项目进行fork操作。正常流程

1.github用户1fork用户2的项目

（fork之后，在远程库自动创建一个同样的项目）

2.clone到本地

3.本地修改内容

4.提交到暂存区，本地库

5.push到github用户1

6.向用户2申请提交请求

pull requests

new pull request

7.用户2进行pull requestes的处理，并进行merge操作。git知识补充Q：当不小心对整个系统的文件夹进行git inint操作后该如何取消？

A：通过命令rm -rf .git对git文件进行删除操作就即可。Q：如何查看帮助文档？

A：通过命令git help 要查看的命令 进行查看即可。

最后，小编想说：我是一名python开发工程师，整理了一套最新的python系统学习教程，想要这些资料的可以关注私信小编“01”即可（免费分享哦）希望能对你有所帮助。