Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							c7ebdda530 
							
						 
					 
					
						
						
							
							added AND op  
						
						
						
						
					 
					
						2020-10-09 12:10:46 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							a0d940638c 
							
						 
					 
					
						
						
							
							use orderermap  
						
						
						
						
					 
					
						2020-10-09 12:04:19 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							c09513803a 
							
						 
					 
					
						
						
							
							wip  
						
						
						
						
					 
					
						2020-10-09 11:37:47 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							f95226e267 
							
						 
					 
					
						
						
							
							ops work in theory!  
						
						
						
						
					 
					
						2020-10-09 11:10:37 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							f479a7e8e3 
							
						 
					 
					
						
						
							
							wip  
						
						
						
						
					 
					
						2020-10-09 10:59:03 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							f7d4695837 
							
						 
					 
					
						
						
							
							binary tree ftw  
						
						
						
						
					 
					
						2020-10-09 08:51:14 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							5ee52f9506 
							
						 
					 
					
						
						
							
							wip  
						
						
						
						
					 
					
						2020-10-09 08:51:14 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							c2159d9861 
							
						 
					 
					
						
						
							
							postfix with traverse op  
						
						
						
						
					 
					
						2020-10-09 08:51:14 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							95bc1e1599 
							
						 
					 
					
						
						
							
							include traverse as a operator token  
						
						
						
						
					 
					
						2020-10-09 08:51:14 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							e32bc43c4e 
							
						 
					 
					
						
						
							
							postfix wip!  
						
						
						
						
					 
					
						2020-10-09 08:51:14 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							a8bdc12d83 
							
						 
					 
					
						
						
							
							to postfix wip  
						
						
						
						
					 
					
						2020-10-09 08:51:14 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							ae59ad57f4 
							
						 
					 
					
						
						
							
							tree wip  
						
						
						
						
					 
					
						2020-10-09 08:51:14 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							c321600afa 
							
						 
					 
					
						
						
							
							fixed wrapping!  
						
						
						
						
					 
					
						2020-10-09 08:51:14 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							4c95efa469 
							
						 
					 
					
						
						
							
							wip  
						
						
						
						
					 
					
						2020-10-09 08:51:14 +11:00 
						 
				 
			
				
					
						
							
							
								Morgan Bazalgette 
							
						 
					 
					
						
						
						
						
							
						
						
							bb9cb0c60e 
							
						 
					 
					
						
						
							
							fix tests  
						
						
						
						
					 
					
						2020-10-09 08:38:42 +11:00 
						 
				 
			
				
					
						
							
							
								Morgan Bazalgette 
							
						 
					 
					
						
						
						
						
							
						
						
							a125495eec 
							
						 
					 
					
						
						
							
							keep order of keys when json marshalling  
						
						
						
						
					 
					
						2020-10-09 08:38:42 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							a8cfccd3af 
							
						 
					 
					
						
						
							
							Merge master fix  
						
						
						
						
					 
					
						2020-09-13 10:59:40 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							3355e80d85 
							
						 
					 
					
						
						
							
							Merge branch 'master' into new-merge2  
						
						
						
						
					 
					
						2020-09-13 10:52:31 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							f528b28938 
							
						 
					 
					
						
						
							
							Convert to JSON now handles non string keys  
						
						
						
						
					 
					
						2020-09-13 10:44:22 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							9f43a4a265 
							
						 
					 
					
						
						
							
							Keep comments when using the write commandt o update values  
						
						
						
						
					 
					
						2020-09-08 09:46:04 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							fea8510061 
							
						 
					 
					
						
						
							
							Added comments merge strategy  
						
						
						
						
					 
					
						2020-07-17 15:51:03 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							d66a709213 
							
						 
					 
					
						
						
							
							refactored array merge flags into a strategy  
						
						
						
						
					 
					
						2020-07-17 13:26:20 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							2fc39b3865 
							
						 
					 
					
						
						
							
							Can overwrite arrays when merging  
						
						
						
						
					 
					
						2020-07-17 13:07:32 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							b11661a1be 
							
						 
					 
					
						
						
							
							Refactored merge - will allow more sophisticated mergin  
						
						
						
						
					 
					
						2020-06-18 09:44:36 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							eac218980e 
							
						 
					 
					
						
						
							
							Visit document node  
						
						
						
						
					 
					
						2020-06-18 09:03:40 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							80e7f46538 
							
						 
					 
					
						
						
							
							Dont log mergePathStackToString - end up with duplicate logs  
						
						
						
						
					 
					
						2020-06-18 09:03:40 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							89cbe63343 
							
						 
					 
					
						
						
							
							Fixed deep read at root level  
						
						
						
						
					 
					
						2020-06-15 12:31:13 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							1405584892 
							
						 
					 
					
						
						
							
							New,Update now support anchors and aliases  
						
						
						
						
					 
					
						2020-06-11 13:57:13 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							e90b00957b 
							
						 
					 
					
						
						
							
							Added missing flow style  
						
						
						
						
					 
					
						2020-06-11 09:58:10 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							71f5f76213 
							
						 
					 
					
						
						
							
							Delete now works with deep splat  
						
						
						
						
					 
					
						2020-06-11 09:53:36 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							23de61a8d7 
							
						 
					 
					
						
						
							
							Can now update tag/style of nodes without affecting the value  
						
						
						
						
					 
					
						2020-04-17 17:09:33 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							64135a16e1 
							
						 
					 
					
						
						
							
							Use single/double instead of singleQuoted/doubleQuoted  
						
						
						
						
					 
					
						2020-04-17 11:24:45 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							06d8715cbe 
							
						 
					 
					
						
						
							
							Added customStyle flag, split command tests  
						
						
						
						
					 
					
						2020-04-17 11:03:43 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							8f166a9848 
							
						 
					 
					
						
						
							
							Fixed negative index bug  
						
						
						
						
					 
					
						2020-04-14 11:17:29 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							1f9a3f5f6c 
							
						 
					 
					
						
						
							
							Added negative index capability  
						
						
						
						
					 
					
						2020-04-13 10:36:46 +10:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							67fb924e0e 
							
						 
					 
					
						
						
							
							Can find array elements bu value  
						
						
						
						
					 
					
						2020-02-28 15:24:16 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							b64187fe32 
							
						 
					 
					
						
						
							
							Dont recurse into scalar nodes  
						
						... 
						
						
						
						Fixes https://github.com/mikefarah/yq/issues/375  
						
						
					 
					
						2020-02-28 15:03:56 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							f91093d5fe 
							
						 
					 
					
						
						
							
							Colors work for all commands  
						
						
						
						
					 
					
						2020-02-28 10:42:19 +11:00 
						 
				 
			
				
					
						
							
							
								Mike Farah 
							
						 
					 
					
						
						
						
						
							
						
						
							a46386e093 
							
						 
					 
					
						
						
							
							Fixed special characters in path for merging  
						
						
						
						
					 
					
						2020-02-18 20:18:49 +11:00 
						 
				 
			
				
					
						
							
							
								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