GIT 操作之冷门骚操作

女爷i 2022-12-24 00:53 120阅读 0赞

### GIT 操作之冷门骚操作 ###

*  git log（windows下）显示乱码处理
 *  git 合并远程多次分支提交
 *   *  查看
     *  选中
     *   *  方式一
         *  方式二
     *  合并commit流程
 *  git 重置远程提交并找回之前提交的代码
 *   *  查看
     *  重置
     *  ==强制推送(push)==
     *  找回重置前提交的代码
     *  找回

--------------------

***(声明：本教程仅供本人学习使用,如有人使用该技术触犯法律与本人无关)  
(如果有错误，还希望指出。共同进步)***

--------------------

【[附上GIT官方文档网站][GIT]】

--------------------

# git log（windows下）显示乱码处理 #

**设置** 系统环境变量  
![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center]  
**输入**

git config --global core.quotepath false 
    git config --global gui.encoding utf-8
    git config --global i18n.commit.encoding utf-8 
    git config --global i18n.logoutputencoding utf-8

**最后记得重启windows电脑**

--------------------

# git 合并远程多次分支提交 #

## 查看 ##

git log		# 查看需要合并的log信息

## 选中 ##

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center 1]

### 方式一 ###

git rebase -i  1d5a5416729564d6ee59a813e1a062bf1ebd468e

**选中：**  
![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center 2]  
【注】： 选中处理的commit时间之前的那一次  
![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center 3]

### 方式二 ###

git rebase -i  HEAD~N 	# N的范围为自然数 表示合并前几条commit

## 合并commit流程 ##

pick		# 表示主体提交
    	squash 		# 表示合并进主体的提交
    	
    	**修改完pick、squash后编辑模式下输入wq保存**

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center 5]  
**修改后：wq保存退出**  
![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center 6]  
**最后强制推送：**

git push origin master --force

# git 重置远程提交并找回之前提交的代码 #

## 查看 ##

git log		# 查看需要合并的log信息

## 重置 ##

git reset --hard (log_commit_哈希值)
    	
    	# 例子：
    	git reset --hard 1d5a5416729564d6ee59a813e1a062bf1ebd468e

## 强制推送(push) ##

git push origin master --force

## 找回重置前提交的代码 ##

git reflog	# 查看本地存储所有git操作历史

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center 8]

## 找回 ##

git reflog	# 查看本地存储所有git操作历史

**恢复：**

git reset --hard (log_commit_哈希值)
    	
    	# 例子
    	git reset --hard 2fe0e00

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center 9]  
![在这里插入图片描述][20201126145748985.png_pic_center]  
![在这里插入图片描述][20201126150002399.png_pic_center]  
**成功找回**

[GIT]: https://git-scm.com/book/zh/v2
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center]: /images/20221120/513a9f97b4ab4041a24640f0553f430c.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center 1]: /images/20221120/789b54fd239340bf8559f4d1262f52bf.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center 2]: https://img-blog.csdnimg.cn/20201126112713421.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw==,size_16,color_FFFFFF,t_70#pic_center
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center 3]: https://img-blog.csdnimg.cn/20201126115051554.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw==,size_16,color_FFFFFF,t_70#pic_center
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center 4]: https://img-blog.csdnimg.cn/20201126115434734.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw==,size_16,color_FFFFFF,t_70#pic_center
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center 5]: https://img-blog.csdnimg.cn/20201126115647622.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw==,size_16,color_FFFFFF,t_70#pic_center
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center 6]: https://img-blog.csdnimg.cn/20201126123859401.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw==,size_16,color_FFFFFF,t_70#pic_center
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center 7]: https://img-blog.csdnimg.cn/20201126145008952.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw==,size_16,color_FFFFFF,t_70#pic_center
[20201126145039609.png_pic_center]: https://img-blog.csdnimg.cn/20201126145039609.png#pic_center
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center 8]: https://img-blog.csdnimg.cn/20201126145302183.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw==,size_16,color_FFFFFF,t_70#pic_center
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw_size_16_color_FFFFFF_t_70_pic_center 9]: https://img-blog.csdnimg.cn/20201126145854891.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MzYzMzc5Nw==,size_16,color_FFFFFF,t_70#pic_center
[20201126145748985.png_pic_center]: https://img-blog.csdnimg.cn/20201126145748985.png#pic_center
[20201126150002399.png_pic_center]: https://img-blog.csdnimg.cn/20201126150002399.png#pic_center