Commit Graph
100 Commits
Author SHA1 Message Date
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
Chris Lane 9dfefc25aa Merging. 2013-09-01 13:30:44 -04:00
Chris Lane 883ee7c278 Merge pull request #49 from gbremer/ssh-keygen-changes
Adding additional ssh-keygen command examples
2013-09-01 10:25:45 -07:00
Chris Lane 49ffe30aa9 Merge pull request #41 from DerUser/master
Added youtube-dl cheatsheet
2013-09-01 10:22:37 -07:00
Chris Lane 6bfdcd8f0f Made a minor typographical correction to the 'find' cheatsheet 2013-09-01 13:17:44 -04:00
Chris Lane ad66169acc Merge pull request #43 from pierrepo/master
find + pdftk + gs
2013-09-01 10:16:27 -07:00
Chris Lane 74eca97b62 Merge pull request #42 from carlosp420/master
fixing typo in cheat git
2013-09-01 10:14:50 -07:00
Chris Lane abd4f8ca00 Merge pull request #47 from Niichan/master
Cheatsheets added
2013-09-01 10:13:43 -07:00
Chris Lane 29a3fa0254 Merge pull request #48 from gbremer/master
Adding less cheat sheet
2013-09-01 10:12:16 -07:00
Chris Lane d3de6c71c0 Merge pull request #51 from fuzzgun/master
Added sheets for emacs and gpg
2013-09-01 10:10:22 -07:00
Chris Lane 3f796385de Merge pull request #57 from Toam/master
Added ab cheatsheet
2013-09-01 10:09:00 -07:00
Chris Lane e7ca02f79b Merge pull request #59 from ncrocfer/diff_cheatsheets
Added diff cheatsheet
2013-09-01 10:08:08 -07:00
Chris Lane 437f191bf7 Trivial change to mount cheatsheet. 2013-08-27 19:44:58 -04:00
Chris Lane c7c63b42cd Minor changes to the git cheatsheet. 2013-08-27 19:43:24 -04:00
Chris Lane 9e8294b566 Merge branch 'master' of https://github.com/ozdemircili/cheat into ozdemircili-master
* 'master' of https://github.com/ozdemircili/cheat:
  Added git cheats
  Added mount cheatsheet
2013-08-27 19:06:53 -04:00
Chris Lane 29e9215f82 Merge pull request #40 from carlosp420/master
cheat awk: sum integers from a file or stdin
2013-08-27 16:05:08 -07:00
Chris Lane 6990807010 Updated the help command to mention the new create/edit capabilities. Vaguely followed the docopt syntax. 2013-08-26 21:17:55 -04:00
Chris Lane 3e7dcc9b43 Updated the README to mention the new create/edit abilities. 2013-08-26 21:05:05 -04:00
Chris Lane d183a6fb14 Change to the SSH cheatsheet 2013-08-26 20:37:04 -04:00
Chris Lane 496de6ae89 Integrated cheatsheet contents. 2013-08-26 20:34:36 -04:00
Chris Lane cdc2b8ee4d Wrapped some more parenthesis around print statements to retain compatibility with Python 3.3. 2013-08-26 20:16:43 -04:00
Chris Lane 63c391f67a When creating a new cheatsheet using the -c option, the program now
first attempts to write to the ~/.cheat directory, or alternatively
create it if it does not already exist. Failing that, it attempts to
write to the python package directory.
2013-08-26 20:12:59 -04:00
Chris Lane 3399b8905d Removed the asterisks denoting the boundaries of the cheatsheets. 2013-08-26 19:45:12 -04:00
Chris Lane cd1b43118d Merge branch 'master' of https://github.com/bradtse/cheat into bradtse-master
* 'master' of https://github.com/bradtse/cheat:
  Added in a create option also
  Added in an edit option that allows a user to edit the cheatsheet from their default editor. Also made some visual changes to the output of the cheatsheet.
2013-08-26 19:42:40 -04:00
Chris Lane e757bcc46d Merge branch 'master' of https://github.com/shanahanjrs/cheat into shanahanjrs-master
* 'master' of https://github.com/shanahanjrs/cheat:
  Added Python 3 support.
2013-08-26 19:37:40 -04:00
Chris Lane 67c8436691 Fixed a typo I introduced to the mysqldump cheatsheet. 2013-08-26 19:32:38 -04:00
Chris Lane 2e69eb063c Trivial changes to the mysqldump cheatsheet. 2013-08-26 19:31:21 -04:00
Chris Lane d0e1f18e52 Merge branch 'master' of https://github.com/codehill/cheat into codehill-master
* 'master' of https://github.com/codehill/cheat:
  More mysqldump commands.
2013-08-26 19:26:40 -04:00
Chris Lane 7886eea791 Renamed mysql.sql to mysql, because the installer doesn't seem to install that cheatsheet when it has the .sql extension. 2013-08-26 19:21:42 -04:00
Chris Lane bf290ea5b7 Trivial changes. 2013-08-26 19:19:52 -04:00
Chris Lane 37b9e84497 Merge branch 'master' of https://github.com/ozdemircili/cheat into ozdemircili-master
* 'master' of https://github.com/ozdemircili/cheat:
  Added history cheatsheet
  Added history cheatsheet
  History
  Added histroy cheatsheet
  Took out listing of Readme and License file on cheatsheets
  Added mysql cheatsheet
  Added lsof cheatsheet
  Added 2 new cheatsheets
2013-08-26 19:12:54 -04:00
Chris Lane eff1b8136c Merge pull request #38 from carlosp420/master
cheat sed, remove leading spaces with regex
2013-08-26 16:06:22 -07:00
Chris Lane e6d5d9b8dc Merge pull request #32 from albertojacini/ps_cheatsheet
Added ps cheatsheet
2013-08-24 13:48:25 -07:00
Chris Lane f28a42b030 Merge pull request #33 from albertojacini/fix_readme
Marked comments in the example cheatsheet
2013-08-24 13:47:06 -07:00
Chris Lane f96fc89c0a Merge pull request #34 from stvnwlsn/mychanges
add show to apt-cache cheatsheet
2013-08-24 13:46:33 -07:00
Chris Lane c460bfdb31 Added more cheats to the php cheatsheet. 2013-08-23 23:06:29 -04:00
Chris Lane bbbe9193e0 Made trivial changes to some of the cheatsheets to make them play more nicely with colorized output. 2013-08-23 19:00:37 -04:00
Chris Lane b2159662f3 Committed a cheatsheet for 'truncate' 2013-08-23 18:42:26 -04:00
Chris Lane 483a1da08b PHP cheatsheet tweak. 2013-08-23 18:33:15 -04:00
Chris Lane 8ebd96e33b Added a PHP cheatsheet. 2013-08-23 18:32:36 -04:00
Chris Lane b6a17fac42 Merge pull request #28 from amitsaha/yum_cheat
Yum cheat
2013-08-23 15:20:40 -07:00
Chris Lane 7cfaddf935 Gave a shout-out to the 'cheat' RubyGem after it was brought to my attention per issue #22. 2013-08-21 23:35:04 -04:00
Chris Lane c9329b2e89 Minor tweak on the last commit. 2013-08-21 23:09:31 -04:00
Chris Lane 43e66c7747 Trivial changes to the README. 2013-08-21 23:02:58 -04:00
Chris Lane 7138a32c4d Updated the README to include instructions for enabling syntax highlighting. 2013-08-21 23:00:22 -04:00
Chris Lane c15e836268 Made it also necessary to set an environment variable in order to display colors to the terminal (in an effort to avoid an otherwise inevitable holy-war). 2013-08-21 22:56:33 -04:00
Chris Lane fabd1bc242 Resolved a trivial merge conflcit in cheatsheets/sed. Resolved major merge conflict in ./cheat. Made very minor revision to @larsyencken's patch to prevent __init__.py/c files from being listed as cheatsheets. 2013-08-21 22:49:07 -04:00
Chris Lane 6d456d147d Merge pull request #25 from adelviscio/patch-1
Added global flag, replaced redundant redirection.
2013-08-21 19:32:48 -07:00
Chris Lane 07c49e8540 Minor tweak to @smartboyathome's patch. 2013-08-21 22:28:28 -04:00