Commit Graph
100 Commits
Author SHA1 Message Date
Chris Lane 16c31c11fe Merge pull request #138 from fuzzgun/master
Added cheat sheet for irssi
2013-12-27 10:23:25 -08:00
Chris Lane af0ec35ba4 Merge pull request #137 from ImmortalPC/master
(add) AsciiArt, (change) find
2013-12-26 14:09:23 -08:00
Chris Lane e63e7b0e3c Merge pull request #136 from andrewjkerr/additional-cheatsheets
Added cheatsheets for markdown, ncat, and sqlmap.
2013-12-23 11:01:01 -08:00
Chris Lane f3685c42fa Merge pull request #135 from Erethon/feature-cheatsheets-updates
Add some new examples
2013-12-23 10:59:42 -08:00
Chris Lane d8ff70dd57 Merge pull request #133 from Mic92/patch-4
add crontab examples
2013-12-01 10:00:55 -08:00
Chris Lane 01b1cddd04 Merge pull request #132 from amitsaha/lsof_enhancements
Enhancements to 'lsof' cheatsheet.
2013-12-01 10:00:15 -08:00
Chris Lane ed4470e582 Merge pull request #134 from amitsaha/strace
Add cheatsheet for strace
2013-12-01 09:59:01 -08:00
Chris Lane 56cde2f6e5 Merge pull request #131 from lucaswerkmeister/patch-1
Add a gdb cheat sheet
2013-12-01 09:58:26 -08:00
Chris Lane 19505f5d7f Merge pull request #129 from ImmortalPC/master
Adding python (simple web server). Change netstat (deprecated).
2013-12-01 09:57:35 -08:00
Chris Lane d8c723681a Graceful failure on failed copy to DEFAULT_CHEAT_DIR
Pull request #108 added the option to automatically copy an
otherwise-uneditable cheatsheet to your DEFAULT_CHEAT_DIR upon an edit
request. This is a minor tweak that implements some graceful failing if
the DEFAULT_CHEAT_DIR does not exist.
2013-11-11 18:10:00 -05:00
Chris Lane 3234d21654 Fixing filename error in setup.py
I slightly borked a merge conflict a moment ago.
2013-11-11 17:48:06 -05:00
Chris Lane 6cae837a2f Merge branch 'master' of https://github.com/0rax/cheat into 0rax-master
* 'master' of https://github.com/0rax/cheat:
  change block generator not to held block is they are empty + minor pep8 refacto (pylint:8.85/10)
  remove debug
  indent block fail :x, no more triple output
  Some minor modification (open inside the generator for better readability) + one bug fixe (the last block wasnt yiel by the generator)
  Following #128 talk about how output should be made for search. Just changed the way on how the search function output the result, no more ala grep output. Cheatsheets are now parsed [by CheatSheets.__parse_cheat_command_block(self, cheat_fp)] into block (separated by newline), i have seen that all block in cheatsheets are delimited by a blank line, so instead of parsing from first consecutive # to last consecutive command, an output that is not used by all sheets (reference to "7z" cheatfile). And so the block are parsed by begin of the document to blanck line to end of the document. Finally the output is made by indenting the block content by 4 spaces + the title of the sheet on the top. This is a way to handle subcommands in my mind (search "git commit" and you now have all what you want)
  Added search function into cheat, used a grep like output, if needed it could be changed, discussion is open inside #128 issue
  fix edit autocomplete (just dont show description of -e/--edit option and i dont know why
  Add hint to use sudo when creation fail of sheet.
  In response to Issue #108: Added option to copy sheet while not editable.
  Added autocompletion for fish shell

Conflicts:
	setup.py
2013-11-11 17:42:48 -05:00
Chris Lane e2d10680db Trivial formatting changes on vim cheatsheet
Changed some tabs to spaces, etc.
2013-11-11 17:34:45 -05:00
Chris Lane 967fa0cedf Merge branch 'master' of https://github.com/7histle/cheat into 7histle-master
* 'master' of https://github.com/7histle/cheat:
  some new mov vim cmds
2013-11-11 17:33:49 -05:00
Chris Lane b9c60a530a Merge pull request #117 from iamsudip/gitpatch2
Added cheats
2013-11-11 14:30:35 -08:00
Chris Lane 73a8b99110 Merge pull request #126 from Mic92/patch-3
wget: continue flag
2013-11-11 14:29:25 -08:00
Chris Lane 3b604d0baa Merge pull request #127 from Mic92/master
bash: extend switch case example
2013-11-11 14:28:30 -08:00
Chris Lane e81088d379 Merge pull request #120 from Mic92/patch-2
openssl: command to show certificate infos
2013-11-03 10:54:34 -08:00
Chris Lane 931ce7a579 Merge pull request #125 from fmunch/tail
Added tail cheatsheet
2013-11-03 10:52:26 -08:00
Chris Lane e17fa47655 Merge pull request #119 from amitsaha/systemctl
systemctl cheat
2013-11-03 10:51:43 -08:00
Chris Lane c6441524b0 Git cheatsheet: trivial changes
Slightly reorganized the order in which some of the examples were
presented.
2013-10-23 22:06:48 -04:00
Chris Lane fb5721f887 Merge branch 'master' of https://github.com/Ashernor/cheat into Ashernor-master
* 'master' of https://github.com/Ashernor/cheat:
  Adding wget and curl cheats and updating git cheat

Conflicts:
	cheatsheets/curl
2013-10-23 22:04:31 -04:00
Chris Lane 59ba9e2749 Merge pull request #107 from a-sk/fix-zsh-autocompletion
Fix zsh autocompletion
2013-10-23 18:35:47 -07:00
Chris Lane 7bbe9279e1 Merge pull request #114 from iamsudip/gitcpatch
Updated git cheatsheet little
2013-10-23 18:34:11 -07:00
Chris Lane eb4e396c98 Merge pull request #116 from puchrojo/patch-1
Update README.md
2013-10-23 18:31:55 -07:00
Chris Lane 64a1e825a9 Merge pull request #115 from barisinanc/master
Fix on vim cheatsheet
2013-10-23 18:30:42 -07:00
Chris Lane b2f706ac18 Merge pull request #111 from jonlabelle/master
Add cheatsheet and examples for curl.
2013-10-23 18:29:23 -07:00
Chris Lane f5a7c30dc4 Merge pull request #110 from TiTi/master
Add cheatsheets (lsof, netstat, nmap, pdftk, ps, sam2p [new])
2013-10-08 16:58:43 -07:00
Chris Lane 9870deee6f Cheatsheets: minor tweaks
Made minor changes to the ls and rm cheatsheets.
2013-10-08 19:52:46 -04:00
Chris Lane 545c35722a Merge branch 'master' of https://github.com/0rax/cheat into 0rax-master
* 'master' of https://github.com/0rax/cheat:
  Added 1 check for EDITOR var, if EDITOR is set to "" + added try catch to catch subprocess error like EDITOR variable pointing to a non installed editor
  Split EDITOR variable to prevent error on popen while using EDITOR var with spaces
  prepare to merge
  Revert Print back to main, would be easier to integrate other positional option like that
2013-09-23 20:44:41 -04:00
Chris Lane f38da5dc69 Trivial whitespace fix on cheatsheets/date 2013-09-23 20:42:26 -04:00
Chris Lane 176120c3d6 Merge branch 'date-cheat' of https://github.com/gbremer/cheat into gbremer-date-cheat
* 'date-cheat' of https://github.com/gbremer/cheat:
  Adding date cheat
2013-09-23 20:42:00 -04:00
Chris Lane 2240eb6fd1 Trivial whitespace fix on chown cheatsheet. 2013-09-23 20:40:53 -04:00
Chris Lane f52c0d59ba Merge branch 'chown-chgrp' of https://github.com/gbremer/cheat into gbremer-chown-chgrp
* 'chown-chgrp' of https://github.com/gbremer/cheat:
  Adding reference example to chown
2013-09-23 20:40:15 -04:00
Chris Lane 4bc2a27b57 Merge pull request #106 from engstrom/master
Added cheatsheet for the top command
2013-09-23 17:39:20 -07:00
Chris Lane 6eb7ec04ff Merge pull request #102 from gbremer/ssh-keygen-fix
Fixing bit size to standard 4096
2013-09-23 17:37:37 -07:00
Chris Lane b4d19eb4ae Merge pull request #104 from gbremer/find-commands
Adding additional find commands
2013-09-23 17:37:12 -07:00
Chris Lane 350a4ee863 Merge pull request #105 from gbremer/mkdir-commands
Adding mkdir cheat
2013-09-23 17:36:35 -07:00
Chris Lane 0cc76a78a1 Trivial changes to the head cheatsheet. 2013-09-19 19:45:28 -04:00
Chris Lane 0d60d6b558 Merge branch 'patch-6' of https://github.com/maggick/cheat into maggick-patch-6
* 'patch-6' of https://github.com/maggick/cheat:
  correction
  minor spell corrections
  Create head
2013-09-19 19:42:52 -04:00
Chris Lane 963496db86 Restored -d functionality to original
During the last commit, the -d functionality was changed (likely
unintentionally) such that it outputted a raw Python list rather than
lines printed to stdout. I've restored the original functionality,
because the autocompletion scripts rely upon it.
2013-09-19 19:05:22 -04:00
Chris Lane da2b0a872d Deleted cruft
Deleted a 'foo' cheatsheet I accidentally committed while testing.
2013-09-19 18:45:43 -04:00
Chris Lane bbed1c5851 Removed the -c option from argparse
A previous revision merged the functionality implemented by the -c and
-e options, but the -c option was reintroduced during the last revision
(probably) by accident. I took that out given that it no longer serves
a purpose.
2013-09-19 18:43:56 -04:00
Chris Lane 5a026dfb41 Merge pull request #94 from fmunch/uname
Added uname cheatsheet
2013-09-14 18:20:40 -07:00
Chris Lane 4224acbc5c Merge pull request #95 from bfontaine/patch-1
Minor typo in README fixed
2013-09-14 18:19:54 -07:00
Chris Lane c819997844 Merge pull request #93 from fmunch/od
Added od cheatsheet
2013-09-14 14:10:41 -07:00
Chris Lane 78532d804b Fixed a typo in the README. 2013-09-14 12:23:19 -04:00
Chris Lane f1cdfa6dd9 Updated the README. 2013-09-14 11:35:16 -04:00
Chris Lane 30e4078688 Merge branch 'master' of github.com:chrisallenlane/cheat
* 'master' of github.com:chrisallenlane/cheat:
  tar: List content of gz/bz2 archives
2013-09-14 10:52:35 -04:00
Chris Lane 70e61d4e1f Trivial changes. Removed a copyright notice that I hadn't noticed before, and deleted a superfluous 'exit()' call. 2013-09-14 10:52:11 -04:00
Chris Lane 305584196d Merge pull request #92 from Mic92/patch-1
tar: List content of gz/bz2 archives
2013-09-14 07:37:22 -07:00
Chris Lane 587dbf3c11 Integrated the autocompletion scripts into the project, and rewrote the bash version to take advantage of the new -l option. 2013-09-14 10:27:53 -04:00
Chris Lane b24e2b7fd2 Merge branch '0rax-master' into dev
* 0rax-master:
  Added autocomplete for bash
2013-09-14 10:17:45 -04:00
Chris Lane a07079957a Resolved a merge conflict and made a minor commenting change. 2013-09-14 10:13:54 -04:00
Chris Lane 5639c995c3 Updated the help to reflect the new options. 2013-09-14 10:06:45 -04:00
Chris Lane 5e17da0246 Bug fix on the last commit. 2013-09-14 10:05:13 -04:00
Chris Lane ba4093620a Merged the 'create' and 'edit' functionality in order to DRY out the code a bit, because (IMO) the user experience is actually somewhat better when these two commands are merged. 2013-09-14 09:58:33 -04:00
Chris Lane 34f3eafb1a Created the -l option to list cheatsheets. I believe this is goign to be helpful to expose to scripts that are attempting to implement autocomplete. 2013-09-14 09:36:15 -04:00
Chris Lane be7bc488b0 Breaking logic in the main function out into smaller components. 2013-09-14 09:23:33 -04:00
Chris Lane 1894ce6297 Making some minor code readability changes. 2013-09-14 09:06:30 -04:00
Chris Lane 48cdbdd836 Moved around some code blocks for the sake of readabilty. 2013-09-14 08:56:36 -04:00
Chris Lane cef9cde3f3 Merge branch 'master' of https://github.com/0rax/cheat into 0rax-master
* 'master' of https://github.com/0rax/cheat:
  Added autocomplete for bash
2013-09-14 08:40:35 -04:00
Chris Lane 4b7a1110f3 Merge pull request #91 from ImmortalPC/master
Add apparmor
2013-09-13 17:55:58 -07:00
Chris Lane 54547459b2 Merge pull request #84 from maggick/patch-11
Create sort
2013-09-13 17:52:29 -07:00
Chris Lane dc300f83eb Merge pull request #88 from ABorgna/master
Cheatsheet updates
2013-09-13 17:51:10 -07:00
Chris Lane dc5dbdbb02 Merge pull request #89 from amitsaha/netstat_update
cheatsheets/netstat: Which process is listening on a port
2013-09-13 17:48:50 -07:00
Chris Lane 30640aa0e4 Merge pull request #87 from brunob/master
add minimal screen cheatsheet
2013-09-13 17:47:28 -07:00
Chris Lane 64cba079f9 Merge branch 'master' of https://github.com/ritchielincoln/cheat into ritchielincoln-master
* 'master' of https://github.com/ritchielincoln/cheat:
  give user the option to edit cheatsheet when trying to create an existing cheatsheet
2013-09-07 18:43:13 -04:00
Chris Lane 213c7a31e1 Updated the README to describe the -d flag and zsh coordination. 2013-09-07 14:38:13 -04:00
Chris Lane b107019664 Merge branch 'minus-d-uses-new-line-sep' of https://github.com/a-sk/cheat into a-sk-minus-d-uses-new-line-sep
* 'minus-d-uses-new-line-sep' of https://github.com/a-sk/cheat:
  -d now separates output using a newline
2013-09-07 13:34:45 -04:00
Chris Lane 11b680f49b Merging. 2013-09-07 13:28:10 -04:00
Chris Lane f0a7362149 Merge branch 'master' of https://github.com/shanahanjrs/cheat into shanahanjrs-master
* 'master' of https://github.com/shanahanjrs/cheat:
  Added 'import argparse' to 'cheat'
  Merge
  Added GPL3 license to top of 'cheat' as required.
2013-09-07 13:23:39 -04:00
Chris Lane db3fa0f8ad Merge pull request #79 from maggick/patch-9
Update grep
2013-09-07 10:17:37 -07:00
Chris Lane f51d57499d Merge pull request #82 from adelviscio/patch-7
Removed cat
2013-09-07 10:14:27 -07:00
Chris Lane 3b3f96cfa2 Merge pull request #81 from ritchielincoln/master
added chmod to cheats
2013-09-07 10:12:59 -07:00
Chris Lane b998a2015f Merge pull request #78 from maggick/patch-8
Update aptitude
2013-09-07 10:10:58 -07:00
Chris Lane 16244be4ea Merge pull request #74 from Chimyx/master
Create Pacman (Arch linux package manager)
2013-09-03 17:11:01 -07:00
Chris Lane d3e37c07d3 Merge pull request #70 from maggick/patch-4
correct and add vim shortcuts
2013-09-03 17:05:19 -07:00
Chris Lane b360315298 Merge pull request #76 from thelinuxfr/patch-1
Add set editor to git
2013-09-03 17:02:19 -07:00
Chris Lane 3e05a463b6 Merge pull request #75 from bdien/master
Add tmux cheatfile
2013-09-03 17:01:23 -07:00
Chris Lane 4b1ceeef83 Merge pull request #71 from maggick/patch-5
Create aptitude
2013-09-03 16:59:03 -07:00
Chris Lane 2a9220bb6d Merge pull request #68 from shanahanjrs/master
Added 'GPL3' to setup.py
2013-09-01 19:24:38 -07:00
Chris Lane 79831f81b7 Merge pull request #66 from adelviscio/patch-6
Added diff of two processes/commands
2013-09-01 18:15:48 -07:00
Chris Lane 54e339ef19 Merge pull request #65 from adelviscio/patch-5
View routing table with netstat
2013-09-01 18:15:03 -07:00
Chris Lane 3dbaf5a17f Fixed a minor typo in the grep cheatsheet. 2013-09-01 21:13:35 -04:00
Chris Lane a2ed76db3f Merge branch 'patch-4' of https://github.com/adelviscio/cheat into adelviscio-patch-4
* 'patch-4' of https://github.com/adelviscio/cheat:
  Removed duplicate example, updated description of another example.
2013-09-01 21:12:49 -04:00
Chris Lane 4abdc34c94 Merge branch 'master' of github.com:chrisallenlane/cheat
* 'master' of github.com:chrisallenlane/cheat:
  Cleaned up the loop
2013-09-01 21:11:06 -04:00
Chris Lane 8fde16689d Fixed a small typo in the openssl cheatsheet. 2013-09-01 21:10:41 -04:00
Chris Lane 1c90a76d1e Merge pull request #62 from adelviscio/patch-2
Cleaned up the loop
2013-09-01 18:05:35 -07:00
Chris Lane 14821d424c Minor modifications on the cheat file. Broke the -d option out into its own logical block. 2013-09-01 14:41:29 -04:00
Chris Lane 91d01d9b96 Merge branch 'zsh_completions' of https://github.com/a-sk/cheat into a-sk-zsh_completions
* 'zsh_completions' of https://github.com/a-sk/cheat:
  Install zsh completions
  Add zsh cheats completions
  Add -d/--cheat_directories option to list directories containing cheatsheets
2013-09-01 14:36:02 -04:00
Chris Lane 65c557612e Modified the README. 2013-09-01 13:56:49 -04:00
Chris Lane e71a3d627d Merge branch 'DEFAULT_CHEAT_DIR' of https://github.com/a-sk/cheat into a-sk-DEFAULT_CHEAT_DIR
* 'DEFAULT_CHEAT_DIR' of https://github.com/a-sk/cheat:
  Add note about DEFAULT_CHEAT_DIR to the README file
  Remove odd new line
  Introduce DEFAULT_CHEAT_DIR environment variable
2013-09-01 13:47:42 -04:00
Chris Lane 760b0e4f78 Merge pull request #56 from shanahanjrs/master
Added 7z cheatsheet
2013-09-01 10:44:59 -07:00
Chris Lane ddc99f339a Merge pull request #60 from ImmortalPC/master
Add distcc cheatsheets and add git show
2013-09-01 10:44:20 -07:00
Chris Lane 7b627816c1 Rearranged the order of some of the mysql cheats. 2013-09-01 13:43:19 -04:00
Chris Lane f695290b36 Merge pull request #50 from ponsfrilus/master
Added mysqdump backup and restore and basic connection
2013-09-01 10:42:15 -07:00
Chris Lane 15db9d8011 Resolving a merge-conflict in the 'ssh-keygen' cheatsheet. 2013-09-01 13:40:50 -04:00
Chris Lane f4be23d407 Merge pull request #44 from maggick/patch-1
To copy a key to a remote host on a non-standard port with non-standard ...
2013-09-01 10:36:55 -07:00
Chris Lane 05ef9989e6 Merge pull request #46 from maggick/patch-3
add ssh on a non-standard port
2013-09-01 10:33:03 -07:00