Vladimir Iakovlev 
							
						 
					 
					
						
						
							
						
						c21dbd2be3 
					 
					
						
						
							
							Merge branch 'git-flag-after-filename' of  https://github.com/josephfrazier/thefuck  into josephfrazier-git-flag-after-filename  
						
						
						
						
					 
					
						2016-11-08 23:48:40 +01:00 
						 
				 
			
				
					
						
							
							
								Andrew Wonnacott 
							
						 
					 
					
						
						
							
						
						b4fda04acb 
					 
					
						
						
							
							Now only return [] when correct error was caught  
						
						
						
						
					 
					
						2016-11-03 03:46:27 -04:00 
						 
				 
			
				
					
						
							
							
								Andrew Wonnacott 
							
						 
					 
					
						
						
							
						
						5f6c55d839 
					 
					
						
						
							
							Fix issue with attempting to scroll through options when not-found package has no packages with matching names causing crash.  
						
						
						
						
					 
					
						2016-11-03 03:34:41 -04:00 
						 
				 
			
				
					
						
							
							
								Vladimir Iakovlev 
							
						 
					 
					
						
						
							
						
						6173913291 
					 
					
						
						
							
							Merge pull request  #572  from josephfrazier/ls_all  
						
						... 
						
						
						
						Suggest `ls -A` when `ls` has no output 
						
						
					 
					
						2016-11-01 12:51:04 +01:00 
						 
				 
			
				
					
						
							
							
								Vladimir Iakovlev 
							
						 
					 
					
						
						
							
						
						6f0d1e287d 
					 
					
						
						
							
							#571 : Don't put empty string in history in zsh  
						
						
						
						
					 
					
						2016-10-31 18:52:48 +01:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						756044e087 
					 
					
						
						
							
							Suggest ls -A when ls has no output  
						
						
						
						
					 
					
						2016-10-31 13:49:38 -04:00 
						 
				 
			
				
					
						
							
							
								Vladimir Iakovlev 
							
						 
					 
					
						
						
							
						
						ddd8788353 
					 
					
						
						
							
							#571 : always honor alter_history setting in zsh  
						
						
						
						
					 
					
						2016-10-31 12:57:31 +01:00 
						 
				 
			
				
					
						
							
							
								Vladimir Iakovlev 
							
						 
					 
					
						
						
							
						
						76c0e7bc70 
					 
					
						
						
							
							Merge pull request  #571  from josephfrazier/bash-honor-alter-history  
						
						... 
						
						
						
						bash: always honor alter_history setting 
						
						
					 
					
						2016-10-31 12:56:31 +01:00 
						 
				 
			
				
					
						
							
							
								Vladimir Iakovlev 
							
						 
					 
					
						
						
							
						
						4865bdd81f 
					 
					
						
						
							
							Merge pull request  #569  from scorphus/rebase-skip  
						
						... 
						
						
						
						#N/A: Add `git_rebase_merge_dir` rule 
						
						
					 
					
						2016-10-31 12:55:05 +01:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						fa169c686c 
					 
					
						
						
							
							test_git_flag_after_filename.py: dedupe test commands  
						
						
						
						
					 
					
						2016-10-31 00:22:24 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						9cae0bffff 
					 
					
						
						
							
							git_flag_after_filename: fix flake8 errors  
						
						... 
						
						
						
						These were found by creating a `.flake8` file containing:
    [flake8]
    ignore = E501,W503
    exclude = venv
then running:
    flake8 $(git diff master... --name-only)
See https://github.com/nvbn/thefuck/pull/563  for running `flake8` in CI 
						
						
					 
					
						2016-10-31 00:22:24 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						b519d317f7 
					 
					
						
						
							
							bash: always honor alter_history setting  
						
						... 
						
						
						
						This ensures that even if the command suggested and run by `thefuck`
fails, it will still be added to the history, allowing the user to tweak
it further (or run `fuck` again) if desired.
Note that the fish shell appears to already behave this way. 
						
						
					 
					
						2016-10-30 23:17:52 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						5b420204c9 
					 
					
						
						
							
							git: fix fatal: bad flag '...' after filename  
						
						... 
						
						
						
						For example:
    $ git log README.md -p
    fatal: bad flag '-p' used after filename
    $ fuck
    git log -p README.md [enter/↑/↓/ctrl+c]
    Aborted
    $ git log -p README.md --name-only
    fatal: bad flag '--name-only' used after filename
    $ fuck
    git log -p --name-only README.md [enter/↑/↓/ctrl+c]
    Aborted
    $ git log README.md -p CONTRIBUTING.md
    fatal: bad flag '-p' used after filename
    $ fuck
    git log -p README.md CONTRIBUTING.md [enter/↑/↓/ctrl+c] 
						
						
					 
					
						2016-10-30 21:40:25 -04:00 
						 
				 
			
				
					
						
							
							
								Pablo Santiago Blum de Aguiar 
							
						 
					 
					
						
						
							
						
						07005b591a 
					 
					
						
						
							
							#N/A: Add git_rebase_merge_dir rule  
						
						
						
						
					 
					
						2016-10-30 20:30:26 -02:00 
						 
				 
			
				
					
						
							
							
								Vladimir Iakovlev 
							
						 
					 
					
						
						
							
						
						cb99e42e02 
					 
					
						
						
							
							Merge pull request  #567  from scorphus/git-rm-local-modifications  
						
						... 
						
						
						
						#N/A: Add `git_rm_local_modifications` rule 
						
						
					 
					
						2016-10-30 19:51:20 +01:00 
						 
				 
			
				
					
						
							
							
								Vladimir Iakovlev 
							
						 
					 
					
						
						
							
						
						51f77964c6 
					 
					
						
						
							
							Merge pull request  #568  from scorphus/osx-brew-install  
						
						... 
						
						
						
						#N/A: Do not fail if formula is already installed 
						
						
					 
					
						2016-10-30 19:50:02 +01:00 
						 
				 
			
				
					
						
							
							
								Pablo Santiago Blum de Aguiar 
							
						 
					 
					
						
						
							
						
						30b1c44f91 
					 
					
						
						
							
							#N/A: Do not fail if formula is already installed  
						
						
						
						
					 
					
						2016-10-30 15:02:12 -02:00 
						 
				 
			
				
					
						
							
							
								Pablo Santiago Blum de Aguiar 
							
						 
					 
					
						
						
							
						
						af28f0334a 
					 
					
						
						
							
							#N/A: Add git_rm_local_modifications rule  
						
						
						
						
					 
					
						2016-10-29 17:51:55 -02:00 
						 
				 
			
				
					
						
							
							
								Vladimir Iakovlev 
							
						 
					 
					
						
						
							
						
						5ee5439c1e 
					 
					
						
						
							
							#565 : Refine git_push rule  
						
						
						
						
					 
					
						2016-10-08 12:24:48 +02:00 
						 
				 
			
				
					
						
							
							
								Vladimir Iakovlev 
							
						 
					 
					
						
						
							
						
						cf006dac2c 
					 
					
						
						
							
							Merge branch 'master' into josephfrazier-git-push-u  
						
						... 
						
						
						
						# Conflicts:
#	thefuck/rules/git_push.py 
						
						
					 
					
						2016-10-08 12:20:23 +02:00 
						 
				 
			
				
					
						
							
							
								Vladimir Iakovlev 
							
						 
					 
					
						
						
							
						
						5b535077bf 
					 
					
						
						
							
							#N/A: Stop changing Command inside rules  
						
						
						
						
					 
					
						2016-10-08 12:18:33 +02:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						dda9d55989 
					 
					
						
						
							
							Add flake8 instructions to README.md  
						
						... 
						
						
						
						Also add flake8 to requirements.txt so that it will be installed by:
    pip install -r requirements.txt 
						
						
					 
					
						2016-10-07 22:27:07 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						f0b9c7cb67 
					 
					
						
						
							
							Ignore remaining flake8 rules and exclude ./venv/  
						
						... 
						
						
						
						This should fix the builds. 
						
						
					 
					
						2016-10-07 22:27:07 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						521eb03d7a 
					 
					
						
						
							
							Fix flake8 errors: E127 continuation line over-indented for visual indent  
						
						
						
						
					 
					
						2016-10-07 22:27:07 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						e0cab4fa1b 
					 
					
						
						
							
							Fix flake8 errors: E126 continuation line over-indented for hanging indent  
						
						
						
						
					 
					
						2016-10-07 22:27:07 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						1b30c00546 
					 
					
						
						
							
							Fix flake8 errors: E122 continuation line missing indentation or outdented  
						
						
						
						
					 
					
						2016-10-07 22:27:07 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						a9d55e9c62 
					 
					
						
						
							
							Fix flake8 errors: E128 continuation line under-indented for visual indent  
						
						... 
						
						
						
						See https://github.com/nvbn/thefuck/pull/563#discussion_r82492221  
						
						
					 
					
						2016-10-07 22:26:57 -04:00 
						 
				 
			
				
					
						
							
							
								Vladimir Iakovlev 
							
						 
					 
					
						
						
							
						
						cf3acbfa2e 
					 
					
						
						
							
							Merge branch 'git-push-u' of  https://github.com/josephfrazier/thefuck  into josephfrazier-git-push-u  
						
						
						
						
					 
					
						2016-10-07 10:40:02 +02:00 
						 
				 
			
				
					
						
							
							
								Vladimir Iakovlev 
							
						 
					 
					
						
						
							
						
						4d714994a3 
					 
					
						
						
							
							Merge pull request  #564  from josephfrazier/docker-python  
						
						... 
						
						
						
						Use official Python images for Docker tests 
						
						
					 
					
						2016-10-07 10:38:49 +02:00 
						 
				 
			
				
					
						
							
							
								Vladimir Iakovlev 
							
						 
					 
					
						
						
							
						
						02f717a0e8 
					 
					
						
						
							
							Merge pull request  #562  from josephfrazier/man-help  
						
						... 
						
						
						
						Suggest `foo --help` when `man foo` shows no pages 
						
						
					 
					
						2016-10-07 10:37:33 +02:00 
						 
				 
			
				
					
						
							
							
								Vladimir Iakovlev 
							
						 
					 
					
						
						
							
						
						8f4f2f03a7 
					 
					
						
						
							
							Merge pull request  #561  from josephfrazier/ag-literal  
						
						... 
						
						
						
						Suggest `ag -Q` when relevant 
						
						
					 
					
						2016-10-07 10:35:34 +02:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						432878bd77 
					 
					
						
						
							
							Ignore flake8 errors with inline comments: W291 trailing whitespace  
						
						... 
						
						
						
						See https://github.com/PyCQA/pycodestyle/pull/243  
						
						
					 
					
						2016-10-06 15:31:55 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						fb3d8d1e01 
					 
					
						
						
							
							Ignore flake8 errors with inline comments: F401,F403  
						
						
						
						
					 
					
						2016-10-06 15:31:55 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						c4c6f506f4 
					 
					
						
						
							
							Ignore flake8 errors with inline comments: E402 module level import not at top of file  
						
						... 
						
						
						
						https://github.com/nvbn/thefuck/pull/563#discussion_r82105200  
					
						2016-10-06 15:31:55 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						725605cd20 
					 
					
						
						
							
							Fix flake8 errors: E711 comparison to None should be 'if cond is not None:'  
						
						
						
						
					 
					
						2016-10-06 15:31:55 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						797b42cfd7 
					 
					
						
						
							
							Fix flake8 errors: E302 expected 2 blank lines, found 1  
						
						
						
						
					 
					
						2016-10-06 15:31:55 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						37161832aa 
					 
					
						
						
							
							Fix flake8 errors: E123 closing bracket does not match indentation of opening bracket's line  
						
						
						
						
					 
					
						2016-10-06 15:31:55 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						b221b04d0f 
					 
					
						
						
							
							Fix flake8 errors: F811 redefinition of unused...  
						
						
						
						
					 
					
						2016-10-06 15:31:55 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						dcc13bd2d2 
					 
					
						
						
							
							Fix flake8 errors: F841, E265  
						
						... 
						
						
						
						This commented-out test caused a couple flake8 errors, so get rid of it:
* F841 local variable 'cmd' is assigned to but never used
* E265 block comment should start with '# '
See https://github.com/nvbn/thefuck/pull/563#discussion_r82104360  
						
						
					 
					
						2016-10-06 15:30:53 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						283eb09c19 
					 
					
						
						
							
							Fix flake8 errors: E231 missing whitespace after ','  
						
						
						
						
					 
					
						2016-10-06 13:30:39 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						10d409e6e2 
					 
					
						
						
							
							Fix flake8 errors: E225 missing whitespace around operator  
						
						
						
						
					 
					
						2016-10-06 13:30:13 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						93302c74b5 
					 
					
						
						
							
							Fix flake8 errors: E101/W191 indentation contains (mixed spaces and) tabs  
						
						
						
						
					 
					
						2016-10-06 13:30:13 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						22b005cebb 
					 
					
						
						
							
							Fix flake8 errors: E731 do not assign a lambda expression, use a def  
						
						
						
						
					 
					
						2016-10-06 13:30:05 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						feb36ede5c 
					 
					
						
						
							
							Fix suggestion for git push -u  
						
						... 
						
						
						
						This was broken by https://github.com/nvbn/thefuck/pull/559  
						
						
					 
					
						2016-10-06 13:09:40 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						16a440cb9d 
					 
					
						
						
							
							test_zsh.py: use official python images, not ubuntu  
						
						... 
						
						
						
						This should help reduce build times. 
						
						
					 
					
						2016-10-06 11:15:18 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						10b20574d1 
					 
					
						
						
							
							test_tcsh.py: use official python images, not ubuntu  
						
						... 
						
						
						
						This should help reduce build times. 
						
						
					 
					
						2016-10-06 11:12:38 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						91fceb401a 
					 
					
						
						
							
							test_fish.py: use official python images, not ubuntu  
						
						... 
						
						
						
						This should help reduce build times. 
						
						
					 
					
						2016-10-06 11:09:19 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						4b79e23ba7 
					 
					
						
						
							
							test_bash.py: use official python images, not ubuntu  
						
						... 
						
						
						
						This should help reduce build times. 
						
						
					 
					
						2016-10-06 10:56:37 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						f915a6ed0c 
					 
					
						
						
							
							test_performance.py: use python:3 image, not ubuntu  
						
						... 
						
						
						
						This should help reduce build times. 
						
						
					 
					
						2016-10-06 10:54:47 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Frazier 
							
						 
					 
					
						
						
							
						
						e9d29726bc 
					 
					
						
						
							
							Run flake8 using Travis CI  
						
						
						
						
					 
					
						2016-10-05 11:00:39 -04:00