1
0
mirror of https://github.com/agarrharr/awesome-cli-apps synced 2024-12-22 12:50:38 +01:00

Resolve merge conflict

This commit is contained in:
Adam Harris 2016-04-06 08:39:45 -06:00
commit 948b7be819

View File

@ -94,16 +94,16 @@ Inspired by the [awesome](https://github.com/sindresorhus/awesome) list thing.
## Productivity
- [AutoScreenshotUploader](https://github.com/yask123/AutoScreenshotUploader)- Instantly capture and upload screenshot to [imgur](https://imgur.com).
- [AutoScreenshotUploader](https://github.com/yask123/AutoScreenshotUploader) - Instantly capture and upload screenshot to [imgur](https://imgur.com).
- [doing](http://brettterpstra.com/projects/doing/) - A command line tool for keeping track of what youre doing and tracking what youve done.
- [ffscreencast](https://github.com/cytopia/ffscreencast)- ffmpeg screencast with video overlay and multi monitor support.
- [idea](https://github.com/IonicaBizau/idea)- A lightweight CLI tool and module for keeping ideas in a safe place quick and easy.
- [imgur-uploader-cli](https://github.com/kevva/imgur-uploader-cli)- Upload images to imgur.
- [geeknote](https://github.com/VitaliyRodnenko/geeknote)- Console client for Evernote.
- [ffscreencast](https://github.com/cytopia/ffscreencast) - ffmpeg screencast with video overlay and multi monitor support.
- [idea](https://github.com/IonicaBizau/idea) - A lightweight CLI tool and module for keeping ideas in a safe place quick and easy.
- [imgur-uploader-cli](https://github.com/kevva/imgur-uploader-cli) - Upload images to imgur.
- [geeknote](https://github.com/VitaliyRodnenko/geeknote) - Console client for Evernote.
- [ledger](http://ledger-cli.org) - Powerful, double-entry accounting system that is accessed from the UNIX command-line.
- [The Mutt E-Mail Client](http://www.mutt.org/) - Email client.
- [Taskwarrior](http://taskwarrior.org) - Free and Open Source Software that manages your TODO list from your command line.
- [Timetrap](https://github.com/samg/timetrap)- Simple command line timetracker.
- [Timetrap](https://github.com/samg/timetrap) - Simple command line timetracker.
## Utilities
@ -129,8 +129,8 @@ Inspired by the [awesome](https://github.com/sindresorhus/awesome) list thing.
## Command Line Tools
- [The Fuck](https://github.com/nvbn/thefuck)- Magnificent app which corrects your previous console command.
- [tldr](https://github.com/tldr-pages/tldr)- Simplified and community-driven man pages.
- [The Fuck](https://github.com/nvbn/thefuck) - Magnificent app which corrects your previous console command.
- [tldr](https://github.com/tldr-pages/tldr) - Simplified and community-driven man pages.
- [howdoi](https://github.com/gleitz/howdoi) - Instant coding answers via the command line.
- [how2](https://github.com/santinic/how2) - Finds the simplest way to do something on a unix bash command line (Nodejs implementation of howdoi).
- [Cash](https://github.com/dthree/cash) - Cross-platform Linux commands in pure ES6.
@ -164,7 +164,7 @@ Inspired by the [awesome](https://github.com/sindresorhus/awesome) list thing.
- [j](https://github.com/rupa/j) - semi clone of autojump ([https://github.com/wting/autojump](https://github.com/wting/autojump)) in shell/awk.
- [pm](https://github.com/Angelmmiguel/pm) - The easy way to switch to your projects on the shell.
- [z](https://github.com/rupa/z) - z is the new j, yo.
- [happyfinder](https://github.com/hugows/hf)- (another) Fuzzy file finder for the command line.
- [happyfinder](https://github.com/hugows/hf) - (another) Fuzzy file finder for the command line.
- [PathPicker](https://facebook.github.io/PathPicker/) - After parsing the output from a command, PathPicker presents you with a nice UI to select which files you're interested in.
- [find-up-cli](https://github.com/sindresorhus/find-up-cli) - Find a file by walking up parent directories.
@ -198,7 +198,7 @@ Inspired by the [awesome](https://github.com/sindresorhus/awesome) list thing.
## SVG
- [SVGO](https://github.com/svg/svgo)- SVG Optimizer is a Nodejs-based tool for optimizing SVG vector graphics files.
- [SVGO](https://github.com/svg/svgo) - SVG Optimizer is a Nodejs-based tool for optimizing SVG vector graphics files.
## Text Manipulation