Repos-que-me-gustan/the-book-of-secret-knowledge-copy
1
0
Fork 0
Code Pull Requests Activity

vimdiff: minor updates

Browse Source
This commit is contained in:
@trimstray 2019-06-10 18:29:24 +02:00 committed by GitHub
parent 9147a49cf7
commit 11a8f7464b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
README.md
View File

@ -1232,6 +1232,7 @@ CyberTalks</b></a> - talks, interviews, and article about cybersecurity.<br>
* [kill](#tool-kill) * [kill](#tool-kill)
* [find](#tool-find) * [find](#tool-find)
* [diff](#tool-diff) * [diff](#tool-diff)
* [vimdiff](#tool-vimdiff)
* [tail](#tool-tail) * [tail](#tool-tail)
* [cpulimit](#tool-cpulimit) * [cpulimit](#tool-cpulimit)
* [pwdx](#tool-pwdx) * [pwdx](#tool-pwdx)
@ -1827,29 +1828,35 @@ diff <(cd directory1 && find | sort) <(cd directory2 && find | sort)
```bash ```bash
diff <(cat /etc/passwd) <(cut -f2 /etc/passwd) 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 ##### Highlight the exact differences, based on characters and words
```sh ```bash
vimdiff file1 file2 vimdiff file1 file2
``` ```
Compare two JSON files ###### Compare two JSON files
```sh ```bash
vimdiff <(jq -S . A.json) <(jq -S . B.json) vimdiff <(jq -S . A.json) <(jq -S . B.json)
``` ```
Compare Hex dump ###### Compare Hex dump
```sh ```bash
d(){ vimdiff <(f $1) <(f $2);};f(){ hexdump -C $1|cut -d' ' -f3-|tr -s ' ';}; d ~/bin1 ~/bin2 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` Save [diffchar](https://raw.githubusercontent.com/vim-scripts/diffchar.vim/master/plugin/diffchar.vim) @ `~/.vim/plugins`
Click `F7` to switch between diff modes Click `F7` to switch between diff modes
Usefull vimdiff commands: Usefull `vimdiff` commands:
* `qa` to exit all windows * `qa` to exit all windows
* `:vertical resize 70` to resize window * `:vertical resize 70` to resize window
* Set window width `Ctrl+W [N columns]+(Shift+)<\>` * Set window width `Ctrl+W [N columns]+(Shift+)<\>`