Annex
									
								 
							
						
					 
				 
				
					
						
							
							resolvemerge: finish up by committing 
						
					 
				 
				2014-07-11 16:59:49 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 Assistant
									
								 
							
						
					 
				 
				
					
						
							
							fix build with path-pieces-0.1.4 
						
					 
				 
				2014-07-13 19:24:38 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 Backend
									
								 
							
						
					 
				 
				
					
						
							
							migrate: Avoid re-checksumming when migrating from hashE to hash backend. 
						
					 
				 
				2014-07-10 17:06:04 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 Build
									
								 
							
						
					 
				 
				
					
						
							
							typo 
						
					 
				 
				2014-07-07 14:30:38 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 CmdLine
									
								 
							
						
					 
				 
				
					
						
							
							resolvemerge: New plumbing command that runs the automatic merge conflict resolver. 
						
					 
				 
				2014-07-11 16:45:18 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 Command
									
								 
							
						
					 
				 
				
					
						
							
							resolvemerge: finish up by committing 
						
					 
				 
				2014-07-11 16:59:49 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 Common
									
								 
							
						
					 
				 
				
					
						
							
							Use lower case hash directories for storing files on crippled filesystems, same as is already done for bare repositories. 
						
					 
				 
				2013-04-04 15:46:33 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 Config
									
								 
							
						
					 
				 
				
					
						
							
							reorg 
						
					 
				 
				2014-01-21 18:08:56 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 debian
									
								 
							
						
					 
				 
				
					
						
							
							bug closure 
						
					 
				 
				2014-07-13 19:22:41 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 doc
									
								 
							
						
					 
				 
				
					
						
							
							
						
					 
				 
				2014-07-14 02:08:55 +00:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 Git
									
								 
							
						
					 
				 
				
					
						
							
							Fix git version that supported --no-gpg-sign. 
						
					 
				 
				2014-07-08 12:46:15 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 Limit
									
								 
							
						
					 
				 
				
					
						
							
							fix transfers of key with no associated file 
						
					 
				 
				2014-01-23 16:44:02 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 Logs
									
								 
							
						
					 
				 
				
					
						
							
							import metadata from feeds 
						
					 
				 
				2014-07-03 14:15:00 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 Messages
									
								 
							
						
					 
				 
				
					
						
							
							hlint 
						
					 
				 
				2013-04-03 03:52:41 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 Remote
									
								 
							
						
					 
				 
				
					
						
							
							S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. 
						
					 
				 
				2014-07-11 15:21:43 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 RemoteDaemon
									
								 
							
						
					 
				 
				
					
						
							
							export CreateProcess fields from Utility.Process 
						
					 
				 
				2014-06-10 19:20:14 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 standalone
									
								 
							
						
					 
				 
				
					
						
							
							fix logic 
						
					 
				 
				2014-07-04 13:58:09 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 static
									
								 
							
						
					 
				 
				
					
						
							
							Revert "remove newlines from static js and css" 
						
					 
				 
				2014-06-13 02:20:39 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 templates
									
								 
							
						
					 
				 
				
					
						
							
							reword 
						
					 
				 
				2014-05-15 21:45:36 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 Types
									
								 
							
						
					 
				 
				
					
						
							
							migrate: Avoid re-checksumming when migrating from hashE to hash backend. 
						
					 
				 
				2014-07-10 17:06:04 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 Upgrade
									
								 
							
						
					 
				 
				
					
						
							
							remove Read instance for Ref 
						
					 
				 
				2014-02-19 01:19:57 -04:00  
			 
		
			
			
			
			
				
					
						
							
								
								
									
									
									 Utility
									
								 
							
						
					 
				 
				
					
						
							
							refactor 
						
					 
				 
				2014-07-10 00:16:53 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 .ghci 
							
						
					 
				 
				
					
						
							
							workaround for ghci fragility in reusing objects compiled with ghc 
						
					 
				 
				2012-10-20 16:20:42 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 .gitattributes 
							
						
					 
				 
				
					
						
							
							decruft 
						
					 
				 
				2011-06-22 18:56:08 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 .gitignore 
							
						
					 
				 
				
					
						
							
							gitignore Build/BuildVersion 
						
					 
				 
				2014-06-18 14:43:20 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 .mailmap 
							
						
					 
				 
				
					
						
							
							seed .mailmap file for more sensible git shortlog 
						
					 
				 
				2014-01-18 15:50:57 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Annex.hs 
							
						
					 
				 
				
					
						
							
							fix for Windows file timestamp timezone madness 
						
					 
				 
				2014-06-12 13:42:21 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Assistant.hs 
							
						
					 
				 
				
					
						
							
							Windows: Assistant now logs to daemon.log. 
						
					 
				 
				2014-06-17 19:27:54 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Backend.hs 
							
						
					 
				 
				
					
						
							
							replace (Key, Backend) with Key 
						
					 
				 
				2014-04-17 18:03:39 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 build.bat 
							
						
					 
				 
				
					
						
							
							windows build foo 
						
					 
				 
				2013-12-05 20:40:28 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 BuildFlags.hs 
							
						
					 
				 
				
					
						
							
							add desktop notifications 
						
					 
				 
				2014-03-22 14:12:19 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 CHANGELOG 
							
						
					 
				 
				
					
						
							
							symlinks 
						
					 
				 
				2010-10-27 15:14:59 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Checks.hs 
							
						
					 
				 
				
					
						
							
							reorg 
						
					 
				 
				2014-01-26 16:36:31 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 CmdLine.hs 
							
						
					 
				 
				
					
						
							
							only run sshCleanup when the command actually used ssh connection caching 
						
					 
				 
				2014-03-13 19:30:13 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Command.hs 
							
						
					 
				 
				
					
						
							
							replace (Key, Backend) with Key 
						
					 
				 
				2014-04-17 18:03:39 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Common.hs 
							
						
					 
				 
				
					
						
							
							add missing Network.URI Ord instance for Debian stable 
						
					 
				 
				2014-04-14 13:25:49 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Config.hs 
							
						
					 
				 
				
					
						
							
							cleaned up AnnexState handling in transports 
						
					 
				 
				2014-04-08 13:42:57 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 configure.hs 
							
						
					 
				 
				
					
						
							
							Rewrote free disk space checking code 
						
					 
				 
				2012-03-22 17:32:47 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 COPYRIGHT 
							
						
					 
				 
				
					
						
							
							Add link COPYRIGHT -> debian/copyright; add COPYRIGHT to sdist. 
						
					 
				 
				2012-06-11 23:27:00 -07:00  
			 
		
			
			
			
			
				
					
						
							
								 Creds.hs 
							
						
					 
				 
				
					
						
							
							webapp: Fix UI for removing XMPP connection. 
						
					 
				 
				2014-04-20 12:46:33 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Crypto.hs 
							
						
					 
				 
				
					
						
							
							Fix initremote with encryption=pubkey to work with S3, glacier, webdav, and external special remotes. 
						
					 
				 
				2014-02-06 18:25:31 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 ghci 
							
						
					 
				 
				
					
						
							
							brought back fast ghci 
						
					 
				 
				2013-02-27 21:38:01 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 git-annex.cabal 
							
						
					 
				 
				
					
						
							
							fix build with path-pieces-0.1.4 
						
					 
				 
				2014-07-13 19:24:38 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 git-annex.hs 
							
						
					 
				 
				
					
						
							
							unset TZ on Windows 
						
					 
				 
				2014-06-12 14:21:53 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 git-union-merge.hs 
							
						
					 
				 
				
					
						
							
							factor out nukeFile 
						
					 
				 
				2012-06-06 13:13:13 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Git.hs 
							
						
					 
				 
				
					
						
							
							remove Read instance for Ref 
						
					 
				 
				2014-02-19 01:19:57 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 INSTALL 
							
						
					 
				 
				
					
						
							
							symlinks 
						
					 
				 
				2010-10-27 15:14:59 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Limit.hs 
							
						
					 
				 
				
					
						
							
							replace (Key, Backend) with Key 
						
					 
				 
				2014-04-17 18:03:39 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Locations.hs 
							
						
					 
				 
				
					
						
							
							prospective fix for bad_merge_commit_deleting_all_files 
						
					 
				 
				2014-07-09 15:08:19 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Logs.hs 
							
						
					 
				 
				
					
						
							
							reorg matcher types; no non-type code changes 
						
					 
				 
				2014-03-29 14:43:34 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Makefile 
							
						
					 
				 
				
					
						
							
							better way to generate tags 
						
					 
				 
				2014-07-01 15:11:47 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Messages.hs 
							
						
					 
				 
				
					
						
							
							refactor 
						
					 
				 
				2014-01-26 15:53:01 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 NEWS 
							
						
					 
				 
				
					
						
							
							update NEWS 
						
					 
				 
				2012-01-19 15:27:39 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 README 
							
						
					 
				 
				
					
						
							
							add README 
						
					 
				 
				2011-05-13 19:20:54 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Remote.hs 
							
						
					 
				 
				
					
						
							
							assistant: When there are multiple remotes giving different ways to access the same repository, honor remote cost settings and use the cheapest available. 
						
					 
				 
				2014-05-19 16:19:33 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Setup.hs 
							
						
					 
				 
				
					
						
							
							make configure -Wall clean 
						
					 
				 
				2014-03-10 16:59:38 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Test.hs 
							
						
					 
				 
				
					
						
							
							Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. 
						
					 
				 
				2014-07-11 16:56:19 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Types.hs 
							
						
					 
				 
				
					
						
							
							moved AssociatedFile definition 
						
					 
				 
				2013-07-04 02:36:02 -04:00  
			 
		
			
			
			
			
				
					
						
							
								 Upgrade.hs 
							
						
					 
				 
				
					
						
							
							Auto-upgrade v3 indirect repos to v5 with no changes. This also fixes a problem when a direct mode repo was somehow set to v3 rather than v4, and so the automatic direct mode upgrade to v5 was not done. 
						
					 
				 
				2013-12-29 13:06:23 -04:00