Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							9864afc4e7 
							
						 
					 
					
						
						
							
							Fixed empty merge problem  
						
						
						
						
					 
					
						2020-02-18 09:15:46 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							83c13ce392 
							
						 
					 
					
						
						
							
							Fixed empty merge problem - need to visit empty arrays and objects  
						
						
						
						
					 
					
						2020-02-13 14:56:58 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							24e906bae6 
							
						 
					 
					
						
						
							
							Fixed numeric map key issue  
						
						
						
						
					 
					
						2020-02-12 15:40:21 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							9de2573009 
							
						 
					 
					
						
						
							
							Fixed merge append arrays  
						
						
						
						
					 
					
						2020-02-07 16:32:39 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							29521f2e3e 
							
						 
					 
					
						
						
							
							Simplified when to visit a node  
						
						
						
						
					 
					
						2020-02-07 14:52:37 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							72cd3e4a2a 
							
						 
					 
					
						
						
							
							Fixed explode for aliases to scalars  
						
						
						
						
					 
					
						2020-02-07 10:42:07 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							d40ad9649d 
							
						 
					 
					
						
						
							
							Fixed explode for aliases to scalars  
						
						
						
						
					 
					
						2020-02-07 10:09:20 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							63313ebb02 
							
						 
					 
					
						
						
							
							Merge branch 'coryrc-fix-merge-with-dots' into compare  
						
						
						
						
					 
					
						2020-02-07 09:10:25 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							de3bfaef60 
							
						 
					 
					
						
						
							
							Merge branch 'fix-merge-with-dots' of git://github.com/coryrc/yq into coryrc-fix-merge-with-dots  
						
						
						
						
					 
					
						2020-02-07 09:09:52 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							108b5cb093 
							
						 
					 
					
						
						
							
							Fixed explode for simple anchors  
						
						
						
						
					 
					
						2020-02-07 09:08:52 +11:00 
						 
				 
			
				
					
						
							
							
								Cory Cross 
							
						 
					 
					
						
						
						
						
							
						
						
							ea9df0eede 
							
						 
					 
					
						
						
							
							Fix path generation when merging file has period in key  
						
						... 
						
						
						
						The program generates a path for every leaf node in the
file-to-be-merged. It does not escape them if they contain a dot, as
the path-expressions document mentions is necessary.
Add in a test for this condition. Verified it fails without the fix. 
						
						
					 
					
						2020-02-04 22:37:00 -08:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							02258fbaae 
							
						 
					 
					
						
						
							
							Fixed deep splatting merge anchors - dont visit twice  
						
						
						
						
					 
					
						2020-02-04 14:10:12 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							6f0538173b 
							
						 
					 
					
						
						
							
							Fix delete adding entries  
						
						
						
						
					 
					
						2020-02-04 09:58:20 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							6840ea8c78 
							
						 
					 
					
						
						
							
							can set indent levels  
						
						
						
						
					 
					
						2020-02-03 16:56:01 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							166f866f28 
							
						 
					 
					
						
						
							
							Pretty print json  
						
						
						
						
					 
					
						2020-02-03 16:31:03 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							4dbe3636c2 
							
						 
					 
					
						
						
							
							Splat array is now the fallback instead of parsing int  
						
						
						
						
					 
					
						2020-01-30 15:11:47 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							4a5bd0ff5b 
							
						 
					 
					
						
						
							
							No need to log error  
						
						
						
						
					 
					
						2020-01-30 15:00:27 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							44f36833cf 
							
						 
					 
					
						
						
							
							Fixed delete array pattern matching  
						
						
						
						
					 
					
						2020-01-30 14:55:58 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							1a4d8158ba 
							
						 
					 
					
						
						
							
							Removed custom value parsing logic  
						
						
						
						
					 
					
						2020-01-20 08:42:08 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							350a8343e9 
							
						 
					 
					
						
						
							
							adv search with prefix!  
						
						
						
						
					 
					
						2020-01-11 19:52:33 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							35fd5b7ae4 
							
						 
					 
					
						
						
							
							Extracted out is path expression checking logic  
						
						
						
						
					 
					
						2020-01-11 19:30:27 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							74c7a4e027 
							
						 
					 
					
						
						
							
							it works! wip  
						
						
						
						
					 
					
						2020-01-11 18:52:15 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							854f5f0fc9 
							
						 
					 
					
						
						
							
							wip json encoding  
						
						
						
						
					 
					
						2020-01-10 22:01:59 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							feba7b04fa 
							
						 
					 
					
						
						
							
							Added path stack to string test  
						
						
						
						
					 
					
						2020-01-09 21:36:05 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							0621307391 
							
						 
					 
					
						
						
							
							Fixed linting errors  
						
						
						
						
					 
					
						2020-01-09 21:27:52 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							924eb6c462 
							
						 
					 
					
						
						
							
							Added missing functions to interface  
						
						
						
						
					 
					
						2020-01-09 21:18:24 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							52eef67e37 
							
						 
					 
					
						
						
							
							more tests, some refactoring  
						
						
						
						
					 
					
						2020-01-09 08:17:56 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							e3f4eedd51 
							
						 
					 
					
						
						
							
							Fixed merge new array  
						
						
						
						
					 
					
						2020-01-06 10:12:38 +13:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							690da9ee74 
							
						 
					 
					
						
						
							
							Fixed merge new array  
						
						
						
						
					 
					
						2020-01-06 10:12:30 +13:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							1f7f1b0def 
							
						 
					 
					
						
						
							
							Merge arrays!  
						
						
						
						
					 
					
						2020-01-05 17:28:24 +13:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							1aa5ec1d40 
							
						 
					 
					
						
						
							
							Merge! wip  
						
						
						
						
					 
					
						2020-01-05 17:14:14 +13:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							625cfdac75 
							
						 
					 
					
						
						
							
							wip;  
						
						
						
						
					 
					
						2019-12-31 15:21:39 +13:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							4dbdd4a805 
							
						 
					 
					
						
						
							
							Deep splat!  
						
						
						
						
					 
					
						2019-12-30 16:51:07 +13:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							8a6af1720d 
							
						 
					 
					
						
						
							
							Fixed modify array issue!  
						
						
						
						
					 
					
						2019-12-30 11:21:21 +13:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							0652f67a91 
							
						 
					 
					
						
						
							
							Refactored!  
						
						
						
						
					 
					
						2019-12-28 20:19:37 +13:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							df52383ffb 
							
						 
					 
					
						
						
							
							Delete works! needs refactor  
						
						
						
						
					 
					
						2019-12-28 10:51:54 +13:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							707ad09ba5 
							
						 
					 
					
						
						
							
							Refactor wip  
						
						
						
						
					 
					
						2019-12-27 19:06:58 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							cf389bed4a 
							
						 
					 
					
						
						
							
							Refactor wip  
						
						
						
						
					 
					
						2019-12-27 19:06:08 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							ff5b23251b 
							
						 
					 
					
						
						
							
							Refactor wip  
						
						
						
						
					 
					
						2019-12-25 12:11:04 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							93dbe80a77 
							
						 
					 
					
						
						
							
							wip  
						
						
						
						
					 
					
						2019-12-24 10:35:57 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							1e541cd65f 
							
						 
					 
					
						
						
							
							wip handle aliases when printing keys  
						
						
						
						
					 
					
						2019-12-23 09:25:44 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							5204a13685 
							
						 
					 
					
						
						
							
							Show paths  
						
						
						
						
					 
					
						2019-12-23 09:08:00 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							4fb44dbc47 
							
						 
					 
					
						
						
							
							Return path, smart print  
						
						
						
						
					 
					
						2019-12-22 17:13:11 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							784513dd18 
							
						 
					 
					
						
						
							
							Merge anchors - refactored  
						
						
						
						
					 
					
						2019-12-22 15:35:16 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							865a55645c 
							
						 
					 
					
						
						
							
							Merge anchors - refactored  
						
						
						
						
					 
					
						2019-12-22 15:33:54 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							949bf1c1d7 
							
						 
					 
					
						
						
							
							Merge anchors - wip  
						
						
						
						
					 
					
						2019-12-22 15:15:15 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							19fe718cfb 
							
						 
					 
					
						
						
							
							Aliases!  
						
						
						
						
					 
					
						2019-12-16 21:09:23 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							290579ac7f 
							
						 
					 
					
						
						
							
							Handle simple aliases  
						
						
						
						
					 
					
						2019-12-16 20:38:55 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							d7392f7b58 
							
						 
					 
					
						
						
							
							Refactoring  
						
						
						
						
					 
					
						2019-12-16 16:46:20 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							a3cebec2fd 
							
						 
					 
					
						
						
							
							Added prefix command  
						
						
						
						
					 
					
						2019-12-16 16:17:01 +11:00