Merge branch 'master' of github.com:chrisallenlane/cheat

* 'master' of github.com:chrisallenlane/cheat: (24 commits)
  [APT-GET] Change <cat | grep> to grep [PACMAN] Change the AUR instructions
  Make cheat working with python3 :)
  [DD] Watch the progress of `dd` with `pv` and `zenity`
  [APT−GET] Show apt-get installed packages
  [DD] Add some tricks for dd
  [APT-GET] Donwload deb withtou installing it
  [NMAP] Speed up nmap scan
  [NMAP] Correct a bug
  [FIND] add a cheat to find all files that have the same node (hard link) as MY_FILE
  [NMAP] Update nmap
  [IPTABLES] Add some cheats for iptables
  [SSH] add a cheat for ssh (encryption)
  [IPTABLES,TCPDUMP] Add cheats for iptables and tcpdump
  [XARGS] Add xargs example
  - Cheatsheets added for a couple of my favourite commands:    - rsync: file copy and backup multi-tool    - indent: one liner to nicely format C/C++ source.
  [PS,GREP] Exclude grep from your grepped output of ps.
  Update wget
  Update wget
  Adding two invaluable commands to tmux cheatsheet
  include commands to mirror locally
  ...

cheatsheets/git

@@ -47,6 +47,7 @@ git checkout master                                     # Checkout local master
 git checkout -b new_branch                              # Create and checkout a new branch
 git merge upstream/master                               # Merge remote into local repo
 git show 83fb499                                        # Show what a commit did.
+git show 83fb499:path/fo/file.ext                       # Shows the file as it appeared at 83fb499.
 git diff branch_1 branch_2                              # Check difference between branches
 git log                                                 # Show all the commits
 git status                                              # Show the changes from last commit