个人整理
1、覆盖本地文件的方法
Git Reset 三种模式
HEAD、master 与 branch
# git fetch <远程主机名> <远程分支名>:<本地分支名>
# git fetch origin master:temp
# git merge temp
# git pull = git fetch + git merge
# 如果上述没有冒号,则表示将远程origin仓库的master分支拉取下来到本地当前分支
$ git fetch --all
Fetching origin
remote: Enumerating objects: 13, done.
remote: Counting objects: 100% (13/13), done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 7 (delta 3), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (7/7), 962 bytes | 1024 bytes/s, done.
From https://github.com/jieky-1/Flink_Java
3f1ab2f..a5f520d master -> origin/master
# git reset [<mode>] [<commit>]
# git reset --hard 回退master、index、working tree
$ git reset --hard origin/master
HEAD is now at a5f520d Update Example7.java
2、远程仓库别名使用
# 将本地的master分支推送到origin主机,同时指定origin为默认主机
git push -u origin master
# origin为设置的远程仓库别名, master为本地分支名, djs为远程分支名
git push origin master:djs
# 显示所有远程仓库别名与其对应的 URL
git remote -v
# 添加远程仓库
remote add <shortname> <url> 添加一个新的远程 Git 仓库
# 查看某一个远程仓库的更多信息
git remote show <remote>
# 远程仓库的重命名
git remote rename <旧名> <新名>
# 远程仓库的删除
git remote remove
3、单次push不要超过100MB
4、开VPN访问Github
【解决git报错 10054】OpenSSL SSL_read: Connection was reset, errno 10054
Administrator@MS-VZBXNEFKLPNX MINGW64 /e/BigData200105/Flink_Java (master)
$ git push -u github master
OpenSSL SSL_read: Connection was reset, errno 10054
Administrator@MS-VZBXNEFKLPNX MINGW64 /e/BigData200105/Flink_Java (master)
$ git config --global http.sslVerify "false"
【已解决】OpenSSL SSL_connect: Connection was reset in connection to github.com:443
Administrator@MS-VZBXNEFKLPNX MINGW64 /e/BigData200105/Flink_Java (master)
$ git push -u github master
fatal: unable to access 'https://github.com/jieky-1/Flink_Java_Record.git/': OpenSSL SSL_connect: Connection was reset in connection to github.com:443
# 7890是VPN的端口号
Administrator@MS-VZBXNEFKLPNX MINGW64 /e/BigData200105/Flink_Java (master)
$ git config --global http.proxy 127.0.0.1:7890
Administrator@MS-VZBXNEFKLPNX MINGW64 /e/BigData200105/Flink_Java (master)
$ git config --global https.proxy 127.0.0.1:7890
Administrator@MS-VZBXNEFKLPNX MINGW64 /e/BigData200105/Flink_Java (master)
$ git push -u github master
Enumerating objects: 174, done.
Counting objects: 100% (174/174), done.
Delta compression using up to 8 threads
Compressing objects: 100% (135/135), done.
Writing objects: 100% (174/174), 5.60 MiB | 2.50 MiB/s, done.
Total 174 (delta 54), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (54/54), done.
To https://github.com/jieky-1/Flink_Java_Record.git
* [new branch] master -> master
branch 'master' set up to track 'github/master'.
网络资源
1、Git: 工作区、暂存区、版本库、远程仓库
2、git pull时冲突的几种解决方式
4、Git 分支管理
Git commit 常见用法
改写提交:commit --amend
git commit --help
git 对比两个分支差异
6、如何fork开源项目并提交PR—实战
8、说说对Git pull 和 Git fetch 的理解?有什么区别?
9、文件状态
红色:未提交过的文件(本地库中不存在)
蓝色:提交过,但是之后有做过修改。(本地库中存在)
绿色:未提交过的文件,但是add到了暂存区(本地库中没有,暂存区中有)
黑色:提交过本地库,且之后没有再修改过。(本地库中存在)