Commit graph

618 commits

Author SHA1 Message Date
Joshua Levy
f800f02ba0 Edits to #259 for brevity. 2015-08-11 10:17:40 -07:00
Joshua Levy
f4d3121dc6 Merge pull request #259 from uggla/vimstuff
Add vimdiff and sdiff command.
2015-08-11 10:15:37 -07:00
Joshua Levy
4e794ecfde More on brace expansion.
Updates #116. Thanks also to the suggestion in #1.
2015-08-11 10:14:34 -07:00
Joshua Levy
c8d3b5fe67 Merge pull request #116 from sirsgriffin/brace-expansion
brace expansion example.
2015-08-11 10:04:09 -07:00
Joshua Levy
2f83f3bdd9 Merge pull request #260 from uggla/fix146
Fix for #146.
2015-08-11 10:03:53 -07:00
Uggla
11bbb2bb9d Fix for #146. 2015-08-11 13:56:35 +02:00
Uggla
f7755ef0d2 Add vimdiff and sdiff command. 2015-08-11 13:30:24 +02:00
Joshua Levy
93746b409e Link on filenames handling.
Thanks to @mator. Fixes #71.
2015-08-10 20:47:10 -07:00
Chujie Zeng
dfda8cd6c8 Fix a typo 2015-08-10 00:09:32 +08:00
曾楚杰
c1a628358f Merge pull request #10 from jlevy/master
Sync with English
2015-08-07 10:46:56 +08:00
aneasystone
a5f64eb5f2 Use Tab to list available commands 2015-08-05 15:12:11 +08:00
Joshua Levy
92ab137f08 Merge pull request #252 from peterkokot/patch-sl
sl: update translation#
2015-08-04 12:17:41 -07:00
Joshua Levy
1c7eb1ee11 Merge pull request #251 from zxdvd/patch-1
Fix a typo. modifno should be modinfo
2015-08-04 12:17:03 -07:00
Peter Kokot
873363937e sl: update translation# 2015-08-04 14:47:29 +02:00
Joshua Levy
2cf2393063 More detail on ctrl-r.
Fixes #52.
2015-08-03 21:43:03 -07:00
Xudong Zhang
ab3319f766 Fix a typo. modifno should be modinfo 2015-08-04 10:22:04 +08:00
Joshua Levy
9b03ebf3c2 Merge pull request #235 from xuchunyang/master
zh: Update README-zh.md
2015-08-03 08:22:51 -07:00
Joshua Levy
8952317af5 Merge pull request #249 from jlevy/iostat-mxz
Add iostat example. Improve langauge.
2015-08-03 08:21:59 -07:00
曾楚杰
376f5e0dc9 Merge pull request #9 from jlevy/master
Sync with English
2015-08-01 22:10:58 +08:00
Joshua Levy
c608c225f3 Add iotop. Put netstat + ss in their own item.
Fixes #78
2015-07-30 00:02:44 -07:00
Joshua Levy
123293a0a0 Add iostat example. Improve langauge.
Fixes #231.
2015-07-29 23:35:42 -07:00
Joshua Levy
7514a5efa0 Merge pull request #229 from ceoaliongroo/master
es: improve translation and updates translation from 18/07/2015 to 28/07/2015
2015-07-29 14:17:34 -07:00
Joshua Levy
1b9b9b6117 Merge pull request #247 from peterkokot/patch-sl
sl: update translation
2015-07-29 09:31:04 -07:00
Joshua Levy
518b2b9ed4 Merge pull request #248 from peterkokot/patch-typo
Simplify explanation of the Option key on Mac OS X
2015-07-29 09:30:37 -07:00
Peter Kokot
f97d4359a9 Simplify explanaiton of the Option key on Mac OS X 2015-07-29 07:52:20 +02:00
Peter Kokot
4a23231d86 sl: update translation 2015-07-29 07:47:40 +02:00
Joshua Levy
baaebeb7ff Slightly clarify description for column.
See #240.
2015-07-27 22:57:55 -07:00
Joshua Levy
b0c958fb62 Add coverage of watch.
Thanks to ShawnMilo!
Fixes #237
Fixes #241
2015-07-27 22:52:17 -07:00
Joshua Levy
a1a77f6d37 Merge pull request #232 from unixorn/add-shellcheck-reference
Add link to shellcheck
2015-07-27 22:35:38 -07:00
Carlos Mantilla
844b7bc812 Merge branch 'jlevy/master' 2015-07-28 08:32:08 +03:00
Joshua Levy
fe1df2b928 Add instructions for using alt key in Mac OS. 2015-07-27 22:31:10 -07:00
Carlos Mantilla
63bb362476 es: correction of typos and plurals.
thanks @mayra-cabrera
2015-07-28 08:30:43 +03:00
Joshua Levy
cd0f6e5a14 Merge pull request #242 from peterkokot/patch-sl
sl: update translation
2015-07-27 22:19:38 -07:00
Carlos Mantilla
f60f04afa0 Merge branch 'jlevy/master' 2015-07-28 01:42:24 +03:00
Carlos Mantilla
d0d211ff74 es: update translation from 28-07-2015 2015-07-28 01:42:09 +03:00
Carlos Mantilla
92907cffd3 Merge mayra-cabrera/master into master. 2015-07-28 01:27:14 +03:00
Chunyang Xu
fd2bc50522 zh: Update translation
I think "OS X" now is the official name of OS for Mac, according to
https://en.wikipedia.org/wiki/OS_X
2015-07-27 18:53:18 +08:00
Chunyang Xu
67ab3a8352 zh: Update README-zh.md 2015-07-26 15:29:19 +08:00
Carlos Mantilla
b13a25a788 Merge aaossa/master into master. 2015-07-26 00:52:11 +03:00
Peter Kokot
edfeda1924 sl: update translation 2015-07-25 21:11:52 +02:00
Joshua Levy
24832fe2e1 Merge pull request #228 from Ungsik-Yun/korean-upadate
Korean Translation update
2015-07-25 11:13:58 -07:00
Joshua Levy
738f54bd46 Merge pull request #230 from danasmera/master
Add sysctl command
2015-07-25 11:13:27 -07:00
Joe Block
811078f3d0 Add link to shellcheck 2015-07-25 11:00:40 -07:00
danasmera
07398c07b1 Add sysctl command 2015-07-24 16:06:08 -04:00
Carlos Mantilla
e507c9bf1c es: update translation from 18/07/2015 to 24/07/2015 2015-07-24 17:23:03 +00:00
Ungsik Yun
8d6bf487ed Update README-ko.md 2015-07-24 12:45:35 +09:00
Ungsik Yun
6c8306cf38 Merge pull request #8 from jlevy/master
update
2015-07-24 12:32:46 +09:00
Joshua Levy
bb3c61bcc4 Merge pull request #227 from peterkokot/patch-sl
sl: Update translation
2015-07-23 18:03:22 -07:00
Peter Kokot
59a1593c8d sl: update translation according to English version 2015-07-24 02:46:20 +02:00
Joshua Levy
18ae7a0d25 Merge pull request #221 from augmentedfourth/master
Add `-C` (context) to list of grep options, since it goes well with `-A` and `-B`
2015-07-23 16:58:39 -07:00