zardoz 
								
							 
						 
						
							
							
								
							
							
	5e2dd2ea86  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-08-02 14:29:26 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									gernot 
								
							 
						 
						
							
							
								
							
							
	0b078b2d37  
						 
						
							
							
								
								
								 
							
							
							
						 
						
							2014-08-01 17:57:44 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Xyem 
								
							 
						 
						
							
							
								
							
							
	4e9e700548  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-08-01 09:05:45 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://joeyh.name/ 
								
							 
						 
						
							
							
								
							
							
	64db37a974  
						 
						
							
							
								
								
								Added a comment: interesting idea  
							
							
							
						 
						
							2014-07-30 15:03:46 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Xyem 
								
							 
						 
						
							
							
								
							
							
	bb0ddec05d  
						 
						
							
							
								
								
								 
							
							
							
						 
						
							2014-07-29 15:38:40 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://svario.it/gioele 
								
							 
						 
						
							
							
								
							
							
	ff9131c93a  
						 
						
							
							
								
								
								new wish: add repository name to commit messages  
							
							
							
						 
						
							2014-07-29 15:29:30 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Xyem 
								
							 
						 
						
							
							
								
							
							
	d0ea0a0479  
						 
						
							
							
								
								
								 
							
							
							
						 
						
							2014-07-24 12:31:31 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									https://www.google.com/accounts/o8/id?id=AItOawlScsufvQF7s8TVTwPd-h_QiP5Hn_i-hrs 
								
							 
						 
						
							
							
								
							
							
	168b338d54  
						 
						
							
							
								
								
								Added a comment: good point  
							
							
							
						 
						
							2014-07-21 19:22:30 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://joeyh.name/ 
								
							 
						 
						
							
							
								
							
							
	12ae4ee4ff  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-21 18:40:00 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									https://www.google.com/accounts/o8/id?id=AItOawlScsufvQF7s8TVTwPd-h_QiP5Hn_i-hrs 
								
							 
						 
						
							
							
								
							
							
	9082d4f18f  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-21 18:37:20 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://joeyh.name/ 
								
							 
						 
						
							
							
								
							
							
	22f2040816  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-21 17:28:53 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									https://www.google.com/accounts/o8/id?id=AItOawkt8DjG40gowj_ETchFLDS_Z216tr7p1xw 
								
							 
						 
						
							
							
								
							
							
	a2839c34eb  
						 
						
							
							
								
								
								 
							
							
							
						 
						
							2014-07-21 02:42:30 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									https://www.google.com/accounts/o8/id?id=AItOawlScsufvQF7s8TVTwPd-h_QiP5Hn_i-hrs 
								
							 
						 
						
							
							
								
							
							
	3de6e4b44a  
						 
						
							
							
								
								
								 
							
							
							
						 
						
							2014-07-17 15:31:56 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									https://www.google.com/accounts/o8/id?id=AItOawlScsufvQF7s8TVTwPd-h_QiP5Hn_i-hrs 
								
							 
						 
						
							
							
								
							
							
	34ffbd990b  
						 
						
							
							
								
								
								 
							
							
							
						 
						
							2014-07-17 15:30:21 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									https://www.google.com/accounts/o8/id?id=AItOawlScsufvQF7s8TVTwPd-h_QiP5Hn_i-hrs 
								
							 
						 
						
							
							
								
							
							
	31a4e44941  
						 
						
							
							
								
								
								 
							
							
							
						 
						
							2014-07-17 15:29:59 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	019ed359e6  
						 
						
							
							
								
								
								Merge branch 'master' of ssh://git-annex.branchable.com  
							
							
							
						 
						
							2014-07-15 17:35:58 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://joeyh.name/ 
								
							 
						 
						
							
							
								
							
							
	3372106e9f  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-15 19:13:06 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://joeyh.name/ 
								
							 
						 
						
							
							
								
							
							
	f0eed81357  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-15 19:01:24 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	925e1db85b  
						 
						
							
							
								
								
								retitle  
							
							
							
						 
						
							2014-07-15 14:59:50 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://joeyh.name/ 
								
							 
						 
						
							
							
								
							
							
	6cf1b3eb15  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-15 18:53:47 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	4e44bda4cc  
						 
						
							
							
								
								
								Merge branch 'master' of ssh://git-annex.branchable.com  
							
							
							
						 
						
							2014-07-15 14:28:21 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	522a0922b8  
						 
						
							
							
								
								
								sync: Fix git sync with local git remotes even when they don't have an annex.uuid set.  
							
							... 
							
							
							
							Catch an exception when ensureInitialized is run in a non-initted
repository. In this case, just read the git config, so that the Git.Repo
object is not LocalUnknown, which is what is used to represent remotes
on eg, drives that are not connected.
The assistant already got this right, and like with the assistant, this
causes an implicit git-annex init of the local remote on the second sync,
once the git-annex branch has been pushed to it.
See this comment for more analysis:
http://git-annex.branchable.com/todo/Recovering_from_a_bad_sync/#comment-64e469a2c1969829ee149cbb41b1c138 
This commit was sponsored by jscit. 
							
						 
						
							2014-07-15 14:27:43 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://joeyh.name/ 
								
							 
						 
						
							
							
								
							
							
	82eca051f5  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-15 18:23:50 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://svario.it/gioele 
								
							 
						 
						
							
							
								
							
							
	65ea8409ec  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-15 06:54:40 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://joeyh.name/ 
								
							 
						 
						
							
							
								
							
							
	15c4a21c81  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-14 18:38:58 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://joeyh.name/ 
								
							 
						 
						
							
							
								
							
							
	3bf484a7dc  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-14 18:30:38 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://joeyh.name/ 
								
							 
						 
						
							
							
								
							
							
	309f180130  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-14 18:27:43 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://ypid.wordpress.com/ 
								
							 
						 
						
							
							
								
							
							
	53210e3220  
						 
						
							
							
								
								
								Added a comment: gitignore  
							
							
							
						 
						
							2014-07-12 17:59:42 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://svario.it/gioele 
								
							 
						 
						
							
							
								
							
							
	df53f96063  
						 
						
							
							
								
								
								new feature: do not import new files  
							
							
							
						 
						
							2014-07-12 14:18:59 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://svario.it/gioele 
								
							 
						 
						
							
							
								
							
							
	4059b9aefe  
						 
						
							
							
								
								
								New topic "Recovering from a bad sync"  
							
							
							
						 
						
							2014-07-12 09:00:19 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	398ad93afa  
						 
						
							
							
								
								
								Merge branch 'master' of ssh://git-annex.branchable.com  
							
							
							
						 
						
							2014-07-11 17:00:50 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	cb66ca3a76  
						 
						
							
							
								
								
								resolvemerge: New plumbing command that runs the automatic merge conflict resolver.  
							
							
							
						 
						
							2014-07-11 16:45:18 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://joeyh.name/ 
								
							 
						 
						
							
							
								
							
							
	e69d37a0ae  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-11 20:17:06 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zardoz 
								
							 
						 
						
							
							
								
							
							
	4f0ca08ba5  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-11 11:54:26 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zardoz 
								
							 
						 
						
							
							
								
							
							
	089a23b291  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-11 11:46:08 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	9d71903c2f  
						 
						
							
							
								
								
								migrate: Avoid re-checksumming when migrating from hashE to hash backend.  
							
							
							
						 
						
							2014-07-10 17:06:04 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	564de5e508  
						 
						
							
							
								
								
								Merge branch 'master' of ssh://git-annex.branchable.com  
							
							
							
						 
						
							2014-07-10 16:28:13 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	b66b33c87f  
						 
						
							
							
								
								
								promote comment to todo  
							
							
							
						 
						
							2014-07-10 16:27:12 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://joeyh.name/ 
								
							 
						 
						
							
							
								
							
							
	29d2b5bf22  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-10 19:54:30 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://joeyh.name/ 
								
							 
						 
						
							
							
								
							
							
	98a051eab8  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-10 19:37:38 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	f0fc2568d7  
						 
						
							
							
								
								
								move to todo  
							
							
							
						 
						
							2014-07-10 15:18:12 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://olivier.mehani.name/ 
								
							 
						 
						
							
							
								
							
							
	a3e7a98445  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-09 01:09:33 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zardoz 
								
							 
						 
						
							
							
								
							
							
	1b3c94b82d  
						 
						
							
							
								
								
								 
							
							
							
						 
						
							2014-07-08 13:16:10 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zardoz 
								
							 
						 
						
							
							
								
							
							
	32a0403542  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2014-07-07 12:48:07 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zardoz 
								
							 
						 
						
							
							
								
							
							
	fddbec98f5  
						 
						
							
							
								
								
								 
							
							
							
						 
						
							2014-07-07 12:06:01 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									cehteh 
								
							 
						 
						
							
							
								
							
							
	f964f40be7  
						 
						
							
							
								
								
								 
							
							
							
						 
						
							2014-06-27 07:35:11 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	9fb8038166  
						 
						
							
							
								
								
								Windows: Assistant now logs to daemon.log.  
							
							... 
							
							
							
							Yes, this means that git annex webapp on windows execs git-annex, which
execs itself to set env, and the execs itself again to redirect logs.
This is disgusting. This is Windows(TM). 
							
						 
						
							2014-06-17 19:27:54 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	3b914da9bc 
 
						 
						
							
							
								
								
								update  
							
							
							
						 
						
							2014-06-17 14:33:47 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	611cd84bb2  
						 
						
							
							
								
								
								Merge branch 'master' of ssh://git-annex.branchable.com  
							
							
							
						 
						
							2014-06-17 14:31:09 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	5977e161f3  
						 
						
							
							
								
								
								close  
							
							
							
						 
						
							2014-06-17 14:07:16 -04:00