Browse Source

vimdiff: minor updates

pull/95/head
@trimstray 3 years ago
committed by GitHub
parent
commit
11a8f7464b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
  1. +14
    -7
      README.md

+ 14
- 7
README.md View File

@@ -1232,6 +1232,7 @@ CyberTalks</b></a> - talks, interviews, and article about cybersecurity.<br>
* [kill](#tool-kill)
* [find](#tool-find)
* [diff](#tool-diff)
* [vimdiff](#tool-vimdiff)
* [tail](#tool-tail)
* [cpulimit](#tool-cpulimit)
* [pwdx](#tool-pwdx)
@@ -1827,29 +1828,35 @@ diff <(cd directory1 && find | sort) <(cd directory2 && find | sort)
```bash
diff <(cat /etc/passwd) <(cut -f2 /etc/passwd)
```
##### Tool: vimdiff

___

##### Tool: [vimdiff](http://vimdoc.sourceforge.net/htmldoc/diff.html)

##### Highlight the exact differences, based on characters and words

```sh
```bash
vimdiff file1 file2
```
Compare two JSON files
###### Compare two JSON files

```sh
```bash
vimdiff <(jq -S . A.json) <(jq -S . B.json)
```

Compare Hex dump
```sh
###### Compare Hex dump
```bash
d(){ vimdiff <(f $1) <(f $2);};f(){ hexdump -C $1|cut -d' ' -f3-|tr -s ' ';}; d ~/bin1 ~/bin2
```

###### diffchar

Save [diffchar](https://raw.githubusercontent.com/vim-scripts/diffchar.vim/master/plugin/diffchar.vim) @ `~/.vim/plugins`

Click `F7` to switch between diff modes

Usefull vimdiff commands:
Usefull `vimdiff` commands:

* `qa` to exit all windows
* `:vertical resize 70` to resize window
* Set window width `Ctrl+W [N columns]+(Shift+)<\>`


Loading…
Cancel
Save