| 
						
					 | 
					
						
						
							
						
						31c2bf2ede
					 | 
					
						
						
							
							pkgs/clerie-update-nixfiles: use fast-forward as a softer approach to update master (so nothing gets lost)
						
						
						
						
						
						
					 | 
					
						2024-03-19 18:15:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0fb89ef74d
					 | 
					
						
						
							
							pkgs/clerie-update-nixfiles: Add script that merges back nixfiles updates
						
						
						
						
						
						
					 | 
					
						2024-03-19 17:31:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						79d9bffba1
					 | 
					
						
						
							
							pkgs/clerie-update-nixfiles: switch branch before removing itself
						
						
						
						
						
						
					 | 
					
						2024-03-17 17:02:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						af7bc3dc02
					 | 
					
						
						
							
							pkgs/clerie-update-nixfiles: implement merge that properly overrides target with the full state of the update branch
						
						
						
						
						
						
					 | 
					
						2024-03-17 16:59:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7a4177f360
					 | 
					
						
						
							
							pkgs/nixfiles: rename nixfiles-updated-inputs to clerie-update-nixfiles
						
						
						
						
						
						
					 | 
					
						2024-03-17 16:14:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |