David Hart f700b23f57 Add git merge rule (#755) ...

This fixes https://github.com/nvbn/thefuck/issues/629

2018-01-02 11:47:48 -05:00

..

__init__.py

refact(shells): add and_ method to assemble expressions involving AND

2015-05-16 11:52:50 -03:00

test_ag_literal.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_apt_get_search.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_apt_get.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_apt_invalid_operation.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_apt_list_upgradable.py

Add apt_list_upgradable rule (#732)

2017-11-16 20:19:44 +01:00

test_aws_cli.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_brew_cask_dependency.py

#N/A: Add brew_cask_dependency rule

2017-10-15 16:11:08 +02:00

test_brew_install.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_brew_link.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_brew_uninstall.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_brew_unknown_command.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_brew_update_formula.py

#710: Fix tests

2017-10-15 16:39:40 +02:00

test_cargo_no_command.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_cd_mkdir.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_cd_parent.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_chmod_x.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_composer_not_command.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_cp_omitting_directory.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_dirty_untar.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_dirty_unzip.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_django_south_ghost.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_django_south_merge.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_dnf_no_such_command.py

Tests! Also fixed some bytes-string issues

2017-10-07 12:59:21 +02:00

test_docker_not_command.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_dry.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_fab_command_not_found.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_fix_alt_space.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_fix_file.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_gem_unknown_command.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_add_force.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_add.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_bisect_usage.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_branch_delete.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_branch_exists.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_branch_list.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_checkout.py

Suggest git checkout -b (#754)

2018-01-01 18:30:33 -05:00

test_git_diff_no_index.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_diff_staged.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_fix_stash.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_flag_after_filename.py

git_flag_after_filename: Handle new error message

2017-11-01 09:42:52 -04:00

test_git_help_aliased.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_merge.py

Add git merge rule (#755)

2018-01-02 11:47:48 -05:00

test_git_not_command.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_pull_clone.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_pull_uncommitted_changes.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_pull_unstaged_changes.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_pull.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_push_different_branch_names.py

#652: Add new git_push_different_branch_names rule

2017-10-15 13:30:29 -02:00

test_git_push_force.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_push_pull.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_push_without_commits.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_push.py

git_push: Make option handling more robust (#751)

2018-01-01 19:45:46 -05:00

test_git_rebase_merge_dir.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_rebase_no_changes.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_remote_delete.py

#701: Replace the first single occurrence of delete

2017-10-08 18:55:44 -03:00

test_git_remote_seturl_add.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_rm_local_modifications.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_rm_recursive.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_rm_staged.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_stash_pop.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_stash.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_tag_force.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_git_two_dashes.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_go_run.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_gradle_not_task.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_gradle_wrapper.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_grep_arguments_order.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_grep_recursive.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_grunt_task_not_found.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_gulp_not_task.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_has_exists_script.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_heroku_multiple_apps.py

#728: Add heroku_multiple_apps rule (#729)

2017-11-09 18:42:23 -05:00

test_heroku_not_command.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_history.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_hostscli.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_ifconfig_device_not_found.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_java.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_javac.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_lein_not_task.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_ln_no_hard_link.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_ln_s_order.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_ls_all.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_ls_lah.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_man_no_space.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_man.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_mercurial.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_missing_space_before_subcommand.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_mkdir_p.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_mvn_no_command.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_mvn_unknown_lifecycle_phase.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_no_command.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_no_such_file.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_npm_missing_script.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_npm_run_script.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_npm_wrong_command.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_open.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_pacman_not_found.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_pacman.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_path_from_history.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_php_s.py

#702: fix minor issues with php_s rule

2017-10-15 17:18:21 -02:00

test_pip_unknown_command.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_port_already_in_use.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_prove_recursively.py

#N/A: Add prove_recursively rule

2017-10-15 15:51:09 +02:00

test_python_command.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_python_execute.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_quotation_marks.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_react_native_command_unrecognized.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_remove_trailing_cedilla.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_rm_dir.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_rm_root.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_scm_correction.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_sed_unterminated_s.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_sl_ls.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_ssh_known_host.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_sudo_command_from_user_path.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_sudo.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_switch_lang.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_systemctl.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_tmux.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_touch.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_tsuru_login.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_tsuru_not_command.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_unknown_command.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_vagrant_up.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_whois.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_workon_doesnt_exists.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_yarn_alias.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_yarn_command_not_found.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_yarn_command_replaced.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_yarn_help.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00