git：显示所有冲突文件

原創 大鹏blog 2020-07-03 02:51 
git ls-files -u | cut -f 2 | sort -u

在这里插入图片描述

發表評論
所有評論
還沒有人評論，想成為第一個評論的人麼? 請在上方評論欄輸入並且點擊發布.
相關文章

CentOS7下配置Nginx

背景 最近倒騰服務器的時候，選擇了CentOS7操作系統，在安裝配置Nginx的時候遇到了Permission Denied問題。按照chown和chmod進行配置無果，後來定位到SELinux問題。 SELinux是什麼？ When yo

原創 2024-02-07 13:55:28

常用Linux命令、包括vi 、svn

PS: http://man.linuxde.net/vi /etc/init.d/network restart //=========================================== 更新腳本 cd /www/scr

Ocean_K 2023-08-15 21:24:17

Linux环境下的主流技术部署（基于Docker容器）

搞了臺阿里雲服務器，準備學習下基於Docker容器的各種主流技術部署，那麼讓我們愉快的開始吧！      Docker環境安裝 安裝yum-utils：yum install -y yum-utils device-mapper-pe

原創 2023-02-25 00:27:07

BPF 和 Go: Linux 中的现代内省形式

{"type":"doc","content":[{"type":"blockquote","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null

Marko Kevac 2021-12-20 11:08:55

10 款你不知道的 Linux 环境下的替代工具！

{"type":"doc","content":[{"type":"blockquote","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null

JackTian 2021-12-11 15:33:58

2022年，Rust 将成为 Linux 内核第二官方语言？

{"type":"doc","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"typ

闫园园 2021-12-10 14:33:55

Linux 年度报告发布：2021 预计亏损300w，重点关注开源硬件

{"type":"doc","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"typ

王一鹏 2021-12-09 15:38:57

Android C++系列：Linux线程（一）概念

{"type":"doc","content":[{"type":"heading","attrs":{"align":null,"level":2},"content":[{"type":"text","text":"1. 什麼是線程",

轻口味 2021-12-08 11:33:58

在Linux系统发行版（以CentOS7为例）上部署ElasticSearch集群并启动Kibana和Logstash

{"type":"doc","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"typ

为自己带盐 2021-12-07 10:29:04

2021 专业人士 Linux 系统 TOP 5

{"type":"doc","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"typ

辛晓亮 2021-12-06 10:13:57

微软在Edge不断作死：疑似阻止用户下载谷歌；Linux 之父怒喷桌面版 Linux；滴滴出行美股退市靴子落地...传阿里员工福利再升级，或全面试行灵活办公...

{"type":"doc","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"typ

闫园园 2021-12-06 10:03:56

Android C++系列：Linux信号（三）

{"type":"doc","content":[{"type":"heading","attrs":{"align":null,"level":2},"content":[{"type":"text","text":"可重入函數","at

轻口味 2021-12-03 18:19:01

curl 作者怒喷苹果，我不当工具人； 国美通报批评摸鱼员工，网友急了；Windows 11 恢复蓝屏死机，熟悉的味道回来了

{"type":"doc","content":[{"type":"blockquote","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null

辛晓亮 2021-11-21 11:03:51

“杀死”CentOS ，替代品 Rocky Linux 8.5 发布

{"type":"doc","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"typ

闫园园 2021-11-20 20:43:53

“MSL”出炉？Ubuntu 发布 Multipass 对标 WSL

{"type":"doc","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"typ

辛晓亮 2021-11-12 10:08:56