git difftool
This commit is contained in:
parent
02d3613918
commit
f2d3a0d4c5
|
@ -0,0 +1,3 @@
|
|||
#!/bin/bash
|
||||
|
||||
emacsclient -a "" -c -n --eval "(require 'ediff)" --eval "(ediff-files \"$1\" \"$2\")"
|
|
@ -1,5 +1,6 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# 常用操作命令
|
||||
############################################
|
||||
# grep的或操作,查看当前打开的网络链接
|
||||
lsof -i | grep -E "(LISTEN|ESTABLISHED)"
|
||||
|
||||
|
|
Loading…
Reference in New Issue