[GIT]版本控制工具

Git 是分布式的版本控制工具

Git 的命令

可以直接在终端输入 git+回车，此时会出现提示信息

此时查看提示信息，列出了常用的 git 的可执行命令以及简介

usage: git [--version] [--help] [-C ] [-c =]
           [--exec-path[=]] [--html-path] [--man-path] [--info-path]
           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]
           [--git-dir=] [--work-tree=] [--namespace=]
            []

These are common Git commands used in various situations:

start a working area (see also: git help tutorial)
   clone             Clone a repository into a new directory
   init              Create an empty Git repository or reinitialize an existing one

work on the current change (see also: git help everyday)
   add               Add file contents to the index
   mv                Move or rename a file, a directory, or a symlink
   restore           Restore working tree files
   rm                Remove files from the working tree and from the index
   sparse-checkout   Initialize and modify the sparse-checkout

examine the history and state (see also: git help revisions)
   bisect            Use binary search to find the commit that introduced a bug
   diff              Show changes between commits, commit and working tree, etc
   grep              Print lines matching a pattern
   log               Show commit logs
   show              Show various types of objects
   status            Show the working tree status

grow, mark and tweak your common history
   branch            List, create, or delete branches
   commit            Record changes to the repository
   merge             Join two or more development histories together
   rebase            Reapply commits on top of another base tip
   reset             Reset current HEAD to the specified state
   switch            Switch branches
   tag               Create, list, delete or verify a tag object signed with GPG

collaborate (see also: git help workflows)
   fetch             Download objects and refs from another repository
   pull              Fetch from and integrate with another repository or a local branch
   push              Update remote refs along with associated objects

'git help -a' and 'git help -g' list available subcommands and some
concept guides. See 'git help ' or 'git help '
to read about a specific subcommand or concept.
See 'git help git' for an overview of the system.
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45

Git 的配置信息

查看现有 Git 配置信息

git config --list
1

输出

diff.astextplain.textconv=astextplain
filter.lfs.clean=git-lfs clean -- %f
filter.lfs.smudge=git-lfs smudge -- %f
filter.lfs.process=git-lfs filter-process
filter.lfs.required=true
http.sslbackend=openssl
http.sslcainfo=C:/Program Files/Git/mingw64/ssl/certs/ca-bundle.crt
core.autocrlf=true
core.fscache=true
core.symlinks=false
pull.rebase=false
credential.helper=manager-core
credential.https://dev.azure.com.usehttppath=true
user.name=xxxx
user.email=****@xx.xx****
credential.helper=store
http.sslverify=false
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17

设置 Git 配置信息

用户信息配置

• user.name:提交的用户名称
• user.email:提交的用户邮件
• global: global 设置全局配置,否则设定的为当前项目的配置

git config [--global] user.name xxxx
git config [--global] user.email xxxx
1
2

---

文本编辑器配置

一般 Git 使用的文本编辑器是 Vi 或者 Vim,也可设置为 Emacs

git config [--global] core.editor emacs
1

---

差异分析工具配置

解决合并冲突时使用的差异分析工具,git 的差异分析工具选项包括：
kdiff3，tkdiff，meld，xxdiff，emerge，vimdiff，gvimdiff，ecmerge，和 opendiff 等合并工具的输出信息

git config [--global] merge.tool vimdiff
1

编辑 Git 配置文件

git config -e [--global]
1

输出:

[core]
        repositoryformatversion = 0
        filemode = false
        bare = false
        logallrefupdates = true
        symlinks = false
        ignorecase = true
[remote "origin"]
        url = https://github.com/******/xxxx.git
        fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
        remote = origin
        merge = refs/heads/master
1
2
3
4
5
6
7
8
9
10
11
12
13

Git 仓库操作

[外链图片转存失败,源站可能有防盗链机制,建议将图片保存下来直接上传(img-tQwoB3Mr-1682055699588)(2023-04-21-13-33-00.png)]

• workspace : 工作区
• staging area : 暂存区/缓存区
• local repository : 版本库或本地仓库
• remote repository : 远程仓库

初始化 Git 仓库

git init [path]// 初始化 [指定路径] git 仓库
git add *.c //新增.c结尾的文件为版本控制范围
git add README //新增README文件为版本控制范围
git commit -m '提交说明'
1
2
3
4

克隆 Git 仓库

git clone <repo> [<directory>]
1

• repo: git 仓库
• directory: 本地目录

Git 分支仓库创建

当你切换分支的时候，Git 会用该分支的最后提交的快照替换你的工作目录的内容， 所以多个分支不需要多个目录

Git 远程仓库命令

Git 提交历史

git log [attr]：

• –oneline : 提交记录简洁版本
• –graph : 提交历史拓扑
• –reverse : 逆向显示提交历史
• –author : 查找指定用户的提交日志
• –since : 查找指定日期的提交日志
• –before : 查找指定日期前的提交日志
• –until : 查找到指定日期的提交日志
• –after : 查找指定日期后的提交日志
• –no-merges : 隐藏合并提交
• –decorate : 查看日志标签

git log --before={3.weeks.ago}
git log --after={2010-04-18}
1
2

Git 标签

添加标签

希望记住特别的提交快照,可以使用 git tag 打上标签

git tag -a <tagname> [-m "runoob.com标签"] [commitId]
1

• [-a] 创建一个带注解的标签,记录添加标签的原因,GIT 打开编辑器写注释
• [commitId] 之前忘记添加标签时,可以通过 commitId 指定之前提交的版本添加注释

查看已有标签

git tag
1

删除标签

git tag -d [tagname]
1

查看标签版本的修改内容

git show [tagname]
1

其它操作