Git使用全笔记_lgnore and stop tracking-优快云博客

本文链接：https://blog.youkuaiyun.com/donghuandong/article/details/136466739

本文详细介绍了Git的基本命令，如查看和管理本地及远程分支，删除分支操作，拉取最新状态，设置忽略文件，以及处理多账号登录和SSH秘钥添加与清理。还涉及了如何解决远程分支删除后的本地残留问题和prune命令的使用。

摘要生成于 C知道，由 DeepSeek-R1 满血版支持，前往体验 >

Git 使用最全总结

一、 Git 常用命令

1、查看分支(包括本地和远程)

可以查看所有本地分支和远程分支

$ git branch -a

只查看远程分支

$ git branch -r

=========================================================================

2、删除本地分支

$ git branch -d

=========================================================================

3、删除远程分支

$ git push origin --delete

=========================================================================

4、拉取当前分支最新状态

$ git fetch origin

=========================================================================

5、设置忽略文件和文件夹

第一种：

idea提交的时候会出现一些不需要的文件，尤其是 .idea文件夹和.iml文件每次提交都要进行操作 File —- Settings —- Editor – File Types 在 lgnore files and folders 中添加 .idea 以及 *.iml 然后点击 OK 就可以了! (PS:注意添加时加上分号)

第二种：采用第三方插件.ignore

其中：git清除暂存区

Administrator@CheristHuan-PC MINGW64 /j/GitDepository/mac/spring-cloud (hzs)

$ git rm -rf --cached .

=========================================================================

6、设置忽略文件和文件夹删除缓存的远程分支列表

git fetch -p

处理之前：

处理之后：

二、常见问题

1、多个git账号的登录与切换

新建第一个账户：

CheristHuan@CheristHuan-PC MINGW64 ~/Desktop

$ git config --global user.name “自己的手机号码”

CheristHuan@CheristHuan-PC MINGW64 ~/Desktop

$ git config --global user.email “1********9@qq.com”

CheristHuan@CheristHuan-PC MINGW64 ~/Desktop

$ ssh-keygen -t rsa -C “1********9@qq.com”

Generating public/private rsa key pair.

Enter file in which to save the key (/c/Users/CheristHuan/.ssh/id_rsa): id_rsa_0723

Enter passphrase (empty for no passphrase):

Enter same passphrase again:

Your identification has been saved in id_rsa_0723

Your public key has been saved in id_rsa_0723.pub

The key fingerprint is:

SHA256:B3yY9BpUQrgsvtYkMW/3BNh3unqhC84YZPNWCLrRBJc 1********9@qq.com

The key’s randomart image is:

±–[RSA 3072]----+

| . … o=… |

| oE .+ = |

| o. +* o |

| ++.+.o=. . |

| o.==. So.o |

| =oo+…+ |

| . .*+. + o |

| o*… + |

| … o o+ |

±—[SHA256]-----+

CheristHuan@CheristHuan-PC MINGW64 ~/Desktop

密码：更换成自己的密码

产生2个文件 id_rsa_0723 id_rsa_0723.pub

第二个账户：

CheristHuan@CheristHuan-PC MINGW64 /c/users/CheristHuan

$ ssh-keygen -t rsa -C “9********1@qq.com”

Generating public/private rsa key pair.

Enter file in which to save the key (/c/Users/CheristHuan/.ssh/id_rsa): id_rsa_8868

Enter passphrase (empty for no passphrase):

Enter same passphrase again:

Your identification has been saved in id_rsa_8868

Your public key has been saved in id_rsa_8868.pub

The key fingerprint is:

SHA256:JrxqlSpuU7zauxeY6Fn5nZ2ogOoLQb85NvYMkGPBj9E 9********1@qq.com

The key’s randomart image is:

±–[RSA 3072]----+

| |

|. . |

| = E |

|. B . |

|.* = +o.S |

|…+.X ++ |

|…%.=.o + . |

|…O.Xoo + o |

|o=+==*… |

±—[SHA256]-----+

密码：更换成自己的密码

产生2个文件 id_rsa_8868 id_rsa_8868.pub

备注：

1、重要说明：但是生成的id_rsa id_rsa.pub 到处都可使用（公有、私有）（默认生成在 mac C:\Users\Administrator.ssh 中）

2、git 远程分支删除后，本地依然能看到

看所有本地分支和远程分支（git branch -r 可以只查看远程分支）
发现很多在远程仓库已经删除的分支在本地依然可以看到。

操作：

Administrator@huanzongsheng MINGW64 /e/Git_Depository/RemoteBs29/remote_web (ElsePlatform_20201017)

// 查询分支

$ git branch -a

ElsePlatform_20201017

hb0929

// 删除本地分支

$ git branch -d hb_zlx_20201017_v1

// 删除远程分支

$ git push origin --delete lxc_2020_10_12

第一种：$ git remote prune origin

使用命令 git remote show origin，可以查看remote地址，远程分支，还有本地分支与之相对应关系等信息。

$ git remote show origin
Enter passphrase for key ‘/c/Users/Administrator/.ssh/id_rsa’:
Powered By Gitee Premium

remote origin
Fetch URL: ssh://git@172.41.0.121:222/enterprise/IDManager.git
Push URL: ssh://git@172.41.0.121:222/enterprise/IDManager.git
HEAD branch: master
Remote branches:
master tracked
test_env tracked
zc tracked
zcCommit20210408 tracked
Local branch configured for ‘git pull’:
master merges with remote master
Local ref configured for ‘git push’:
master pushes to master (up to date)

操作：

$ git remote prune origin

Pruning origin
URL: https://xxx@gitlab.com/xxx/xxx.git

[pruned] origin/develop
[pruned] origin/fix_composer_repositories_type
[pruned] origin/join_weixin_module
[pruned] origin/movtop

第二种：$ git fetch -p

git fetch -p 命令
命令行解释--prune -p -- remove any remote tracking branches that no longer exist remotely
英文意思：删除不存在的远程跟踪分支

// 再查询已经删除了

$ git branch -r

origin/HEAD -> origin/master

origin/hzs

3、ssh添加秘钥

方案一：

Administrator@CheristHuan-PC MINGW64 ~

$ eval ‘ssh-agent -s’

SSH_AUTH_SOCK=/tmp/ssh-OvwfvHX5kWZJ/agent.544; export SSH_AUTH_SOCK;

SSH_AGENT_PID=545; export SSH_AGENT_PID;

echo Agent pid 545;

Administrator@CheristHuan-PC MINGW64 ~

$ ssh-add -l

The agent has no identities.

Administrator@CheristHuan-PC MINGW64 ~

$ ssh-add “C:/Users/Administrator/.ssh/id_rsa_0723”

Enter passphrase for C:/Users/Administrator/.ssh/id_rsa_0723:

Identity added: C:/Users/Administrator/.ssh/id_rsa_0723 (1********9@qq.com)

Administrator@CheristHuan-PC MINGW64 ~

$ ssh-add -l

3072 SHA256:fBH7UJA7txSLgb8cglMDYMDgh2lAtn8mdY+6TaZXaNA 1********9@qq.com (RSA)

Administrator@CheristHuan-PC MINGW64 ~

$