git 入门

快来打我* 2022-04-01 05:15 255阅读 0赞

# git入门 #

## 一、下载安装 ##

1.  git官网地址[Git - Downloads][]

## 二、提交仓库 ##

#### 1. 用户配置 ####

$ git config --global user.name  "Your Name"
    $ git config --global user.email  "email@example.com"

**name与"有空格**  
![配置用户名和账号][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70]

#### 2. 创建文件夹,查看当前地址,创建仓库 ####

$ mkdir learngit
    $ cd learngit
    $ pwd
    /Users/michael/learngit
    $ git init
    Initialized empty Git repository in /Users/michael/learngit/.git/

`pwd`查看当前路径  
`ls -ah`查看当前路径的隐藏文件  
![创建仓库][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 1]

#### 3. git版本控制的注意事项: ####

*  git只能跟踪文本文件的改动,可以很具体告诉你哪里改动了,二进制文件只能看出文件大小的改变了,但具体哪里改变了不知道
 *  windows 千万别用记事本编辑,因为记事本惟每个文件开头添加了0xefbbbf（十六进制）的字符,可能会带来很多不必要的麻烦

#### 4. git 文件上传到仓库respository ####

git add readme.txt
     git  commit -m "我是文件解释"

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 2]  
**错误:please tell me who are you**  
原因:由于个人信息未配置好

$ git config --global user.name  "Your Name"
    $ git config --global user.email  "email@example.com"

**name与"有空格**  
成功结果：  
![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 3][]

## 三、时光机穿梭 ##

#### 1.改动文件后查看文件的改动情况 ####

git status

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 4][]

#### 2. 查看具体改动哪些内容 ####

git diff

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 5][]

#### 3. 提交修改 ####

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 6][]

#### 4. 查看提交日志 ####

git log

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 7][]

#### 4. 版本回退 ####

git reset  --hard head^
    git rest 表示回退
    head^ 表示回退上一次 head^^ 上上次 以此类推,也可以用 head~2

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 8][]

#### 5.后悔药,恢复某一个历史版本 ####

这个有两种方法啊,其实归根结底就是一种:找到`commit id`,根据id回到对应的版本

*  如果命令窗没有关闭,可以往上翻翻就可以找到的commit id
 *  如果命令窗关闭了,通过`git reflog`查看日志  
    ![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 9][]  
    **恢复到新版本**

git reset --hard commitId

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 10][]

#### 6. 工作区、暂存区概念很重要 ####

*  工作区：在你电脑里Git存放文件的地方
 *  版本库repository: 在你电脑里Git隐藏文件.git  
    ![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 11][]
 *  回头看看`git add` 和 `git commit`内部怎么操作的
    
     *  `git add`文件添加进去,是将文件提交到暂存区
     *  `git commit`文件提交,是将暂存区的所有文件提交到git仓库repository的当前分支
     *  在工作区新建一个新文档,`git status`查看状态  
        ![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 12][]  
        **提交到版本库**  
        ![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 13][]
    
    #### 7.git 添加整个文件夹和目录 ####
 *  git add 文件夹名/
 *  git add \*.文件后缀名
 *  git add 文件1,文件2,文件3

#### 8.git status中文名称乱码(八进制表示) ####

在git bash 上输入

$ git config --global core.quotepath false

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 14][]

#### 9. fatal: not a git repository (or any of the parent directories): .git 解决方案 ####

翻译:在当前路径下不存在.git文件,也就是说当前路径没有建立git版本库

*  解决方案一:在当前路径下创建版本库,打卡git bash 上输入`$ git init`
 *  解决方案二:将你要上传的文件拷贝到你以前的版本库里  
    ![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 15][]

#### 10. 丢弃工作区的修改恢复到版本库最新(快捷方式) ####

方法有很多

*  `git reset --hard head^`整体回滚到上一个版本
 *  `git checkout --fileName` 单个文件回滚到上个版本  
    ![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 16][]

### 四、推送到远程管理 ###

#### 1.获取SSH秘钥,给Github添加SSH秘钥 ####

*  Git"Could not read from remote repository.Please make sure you have the correct access rights.
 *  ssh-keygen -t rsa -C “username” (注：username为你git上的用户名,一般为邮箱)
 *  cat /User/username/.ssh/id\_rsa.pub  
    ![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 17][]  
    ![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 18][]

#### 2.关联github账号,推送到github ####

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 19][]

成果:  
![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 20][]

#### 3.从github克隆项目 ####

![watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 21][]

### 五、常用的命令 ###

1.  查看文件内容`cat fileName`
2.  当前路径`pwd`
3.  查看当前路径的所有文件`ls`

[Git - Downloads]: https://git-scm.com/downloads
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70]: /images/20220401/35c632a5c1ad4bdcaccee065a3a85286.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 1]: /images/20220401/9c3b164b24a64172b20150aad5a88c3e.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 2]: /images/20220401/0e70847302784893ad04208e60ccad63.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 3]: /images/20220401/f5d16e442b4a4de88da5d85d7007a34f.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 4]: /images/20220401/19b7bcad170847dfa857834551789d44.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 5]: /images/20220401/08f75c414f064a909b63f26eb46e4fa2.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 6]: /images/20220401/f08bfc80a201422cbb3a17aeadeacb8d.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 7]: /images/20220401/61092c0d625841e484988b04e30fc11a.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 8]: /images/20220401/e99c12e36c8943d8956f785f418e34f3.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 9]: /images/20220401/6db35626c6b04d9d872c076826626b09.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 10]: /images/20220401/4f5383cee0ee4b7191a608faf6c5164e.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 11]: /images/20220401/5b6c63a22c914eee8a94dd5925068186.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 12]: /images/20220401/964c1c7e0daa4eb78923d937bac60b19.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 13]: /images/20220401/e075f33c4a9c49bf985820d00b44c520.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 14]: /images/20220401/5720dbde597e4407b6f25f23f6df0e96.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 15]: /images/20220401/c9af22451f8345faa8e7cda15bc639ab.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 16]: /images/20220401/bccf8f25c0154fb58f29af0f600a9ad6.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 17]: /images/20220401/ec456f246c42494d83671cae31dac2d4.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 18]: /images/20220401/f4b4f5a941e64f5c8b2159eef3745228.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 19]: /images/20220401/164f060c725d4d6d85579bf6437b10cc.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 20]: /images/20220401/5e670c9665af4492a7ec80b2fadcfde3.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXlhbmdfdGFuZw_size_16_color_FFFFFF_t_70 21]: /images/20220401/1ab1fdde77284de09e9c3b9e0da1a4b0.png