Commit Graph

205 Commits

Author SHA1 Message Date
Jan Warchoł dc23d67a42 Use --force-with-lease instead of --force for git push
--force flag can be very dangerous, because it unconditionally
overwrites remote branch - if someone pushed new commits to the remote
repo after you last fetched/pulled, and you do push --force, you will
overwrite his commits without even knowing that you did that.  Using
--force-with-lease is much safer because it only overwrites remote
branch when it points to the same commit that you think it points to.

Read more:
https://developer.atlassian.com/blog/2015/04/force-with-lease/
2015-10-30 16:17:56 +01:00
nvbn bbfedb861f Merge branch 'xdg' of https://github.com/mcarton/thefuck into mcarton-xdg 2015-10-21 18:03:39 +08:00
Pablo Santiago Blum de Aguiar 5389d0c106 Add `git_two_dashes` rule 2015-10-17 18:40:53 -03:00
mcarton 4a48108c69 Follow the XDG Base Directory Specification 2015-10-16 16:52:03 +02:00
nvbn 3e8db28a73 #355 Add `touch` rule 2015-09-09 10:53:56 +03:00
nvbn 3d56204f92 Update readme 2015-09-07 19:13:17 +03:00
nvbn df4d2cc88d ⚠️ Remove `settings` param from rules `match`, `get_new_command` and `side_effect` 2015-09-07 13:00:29 +03:00
nvbn 2f9db24ed1 #357 Add `exclude_rules` settings option 2015-09-06 12:55:59 +03:00
nvbn cdd5f21e88 Add `functional` marker 2015-09-06 01:13:44 +03:00
Martin Carton b6855587fa Some README fixes 2015-09-02 00:05:14 +02:00
nvbn 8a4f4eea45 #349 Add note about python-commandnotfound dependency 2015-09-01 18:10:53 +03:00
Michael Lee 301de75aee #35 - Fuzzy matching on maven lifecycle targets 2015-08-26 14:58:45 +01:00
Michael Lee 0d86fce9be #35 mvn will auto add clean package 2015-08-26 14:01:36 +01:00
Vladimir Iakovlev 4163fb5f2e Merge pull request #340 from BuZZ-T/feature/apt-get-search
Adding rule for trying to search using apt-get
2015-08-25 13:48:41 +03:00
nvbn 5e5a8e4dfa #346 Restart shell session after install 2015-08-25 10:18:21 +03:00
Bastian Gebhardt 2b3e8dc62a Adding rule for trying to search using apt-get 2015-08-25 00:20:21 +02:00
Vladimir Iakovlev c5b4628c5c Update README.md 2015-08-24 20:27:11 +03:00
nvbn d4cec3e850 Update readme 2015-08-24 20:25:59 +03:00
Michael Lee 004c0d06eb starts up vagrant if not already running 2015-08-19 17:12:54 +01:00
Vladimir Iakovlev abbbd1f8eb Merge pull request #339 from mcarton/fix-338
Fix #338
2015-08-19 17:19:38 +03:00
Vladimir Iakovlev 700d9ac7e9 Merge pull request #337 from mcarton/cleanup
Some cleanup and fixes
2015-08-19 17:19:08 +03:00
Vladimir Iakovlev 8037a17b73 Merge pull request #333 from mlk/master
basic support for the hdfs dfs <command> when the command misses the …
2015-08-19 17:16:54 +03:00
mcarton 49917ce6b4 Fix #338 2015-08-19 11:00:27 +02:00
mcarton bc6b107066 Fix README and add a test so it won't happen again 2015-08-17 16:07:24 +02:00
Michael Lee 8c9416e57f Renamed to unknown command to better match current functionality 2015-08-14 09:38:42 +01:00
mcarton e9ffe2ea9d Fix confusing sentence in the README
Ref: https://github.com/nvbn/thefuck/pull/283#issuecomment-120170664
2015-08-13 18:28:59 +02:00
Michael Lee 2cdfe105fb Reorderd be in alphabetical order 2015-08-13 16:23:11 +01:00
Michael Lee b494c4e273 basic support for the hdfs dfs <command> when the command misses the dash 2015-08-13 13:09:19 +01:00
nvbn 6222985491 #330 Add support of a single argument 2015-08-09 22:55:48 +03:00
Vladimir Iakovlev 8be353941f Merge pull request #324 from nvbn/298-variants
Add ability to select fixed command from variants
2015-07-31 15:39:57 +03:00
nvbn d442f959e9 #298 Update readme 2015-07-31 15:36:08 +03:00
Vladimir Iakovlev b16de9c7c2 Merge pull request #323 from mcarton/fix-file
#320 Add the `fix_file` rule
2015-07-30 18:05:50 +03:00
mcarton e4b97af73e #320 Add the `fix_file` rule 2015-07-29 21:03:47 +02:00
Martin Carton 9c649c05a9 Force the travis image to track the master branch 2015-07-28 23:59:17 +02:00
nvbn 7933e963d8 #298 Add ability to chose matched rule 2015-07-28 22:04:27 +03:00
Pablo Santiago Blum de Aguiar 65a25d5448 Add a new `tsuru_not_command` rule 2015-07-27 22:34:24 -03:00
nvbn dc16600871 #311 Manually convert md to rst 2015-07-27 23:23:26 +03:00
nvbn 63e62fcba3 #311 Use `setuptools-markdown` 2015-07-27 22:23:20 +03:00
nvbn 3f6652df66 #313 Add new command options to readme 2015-07-27 17:39:52 +03:00
nvbn 20f51f5ffe Merge branch 'unzip-clean' of https://github.com/mcarton/thefuck into mcarton-unzip-clean 2015-07-27 17:29:09 +03:00
Vladimir Iakovlev 6609b8d06a #316 Remove `.py` from `tsuru_login` rule name 2015-07-26 22:09:55 +03:00
Pablo Santiago Blum de Aguiar 2117659c40 Add `tsuru_login` rule 2015-07-25 23:33:38 -03:00
mcarton 8529461742 Update README 2015-07-25 23:14:10 +02:00
nvbn 7906025cc6 #N/A Add docker-based functional tests 2015-07-24 03:56:21 +03:00
nvbn b15bc8c423 #N/A Add `gulp_not_task` rule 2015-07-24 00:47:57 +03:00
nvbn f9f0948349 #N/A Add `docker_not_command` rule 2015-07-24 00:12:29 +03:00
mcarton e4da8a2e5a Add the `git_fix_stash` rule 2015-07-22 23:27:53 +02:00
nvbn b4392ba706 #N/A Add `heroku_not_command` rule 2015-07-22 04:44:37 +03:00
nvbn 92cca7b641 #296 Fix `[enter/ctrl+c]` case in the readme 2015-07-20 22:49:21 +03:00
mcarton e572cab1f3 Have the README look better 2015-07-20 21:12:39 +02:00