mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
5491 commits 13 branches 455 tags 157 MiB
Commit graph

581 commits

Author SHA1 Message Date
Joey Hess
2081a31fda Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-16 20:14:13 -04:00
Joey Hess
cead5d056e blog for the day 2012-09-16 20:13:32 -04:00
Joey Hess
601ee470af sync: Pushes the git-annex branch to remote/synced/git-annex, rather than directly to remote/git-annex. 
This fixes a problem I was seeing in the assistant where two remotes would
attempt to sync with one another at the same time, and both failed pushing
the diverged git-annex branch. Then when both tried to resolve the failed
push, they each modified their git-annex branch, which again each blocked
the other from pushing into it. The result was that the git-annex
branches were perpetually diverged (despite having the same content!) and
once the assistant fell into this trap, it couldn't get out and always
had to do the slow push/fail/pull/merge/push/fail cycle.
 2012-09-16 17:54:12 -04:00
http://meep.pl/
1ea5f13230 poll vote (Tahoe-LAFS) 2012-09-16 19:48:51 +00:00
Joey Hess
e61512f42d fix 2012-09-16 13:13:17 -04:00
Joey Hess
ebdc8422db Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-16 13:11:47 -04:00
Joey Hess
a5230cce7c fix display of only blog posts tagged polls 2012-09-16 13:11:12 -04:00
2001:470:1f04:a19:200b:39d4:308f:4f6c
b3e9a121e0 poll vote (My phone (or MP3 player)) 2012-09-16 16:48:19 +00:00
2001:470:1f04:a19:200b:39d4:308f:4f6c
ce3a5acf9f poll vote (My phone (or MP3 player)) 2012-09-16 16:48:14 +00:00
2001:470:1f04:a19:200b:39d4:308f:4f6c
f8ff6577aa poll vote (My phone (or MP3 player)) 2012-09-16 16:48:08 +00:00
2001:638:a00:2a:298a:16f8:72b0:85b5
874321692e poll vote (My phone (or MP3 player)) 2012-09-16 15:14:11 +00:00
80.217.244.158
d5897c3cdc poll vote (My phone (or MP3 player)) 2012-09-16 14:53:35 +00:00
98.207.92.124
93f42da0bd poll vote (Amazon S3) 2012-09-16 06:52:00 +00:00
Joey Hess
719d229d9d Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-15 22:41:06 -04:00
Joey Hess
dd9e1f9831 blog for the day 2012-09-15 22:40:21 -04:00
188.61.52.255
d0d9eb1031 poll vote (Amazon Glacier) 2012-09-16 01:17:43 +00:00
188.61.52.255
a404ed33c3 poll vote (Tahoe-LAFS) 2012-09-16 01:17:34 +00:00
188.61.52.255
7e76544945 poll vote (Amazon Glacier) 2012-09-16 01:17:17 +00:00
Joey Hess
9a9b4b840e Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-15 20:17:03 -04:00
80.187.96.136
816b9b4200 poll vote (Amazon S3) 2012-09-15 20:20:58 +00:00
89.236.47.66
83a1d4d496 poll vote (My phone (or MP3 player)) 2012-09-15 20:10:35 +00:00
Joey Hess
b453ea8b48 found some bugs 2012-09-15 15:24:07 -04:00
128.61.104.52
0b8fdca494 poll vote (My phone (or MP3 player)) 2012-09-15 15:03:16 +00:00
87.79.135.229
69bdc6207b poll vote (Amazon Glacier) 2012-09-15 13:01:56 +00:00
2001:980:45c4:1:a5a9:c33:f9a:2d05
1c054cd2e6 poll vote (My phone (or MP3 player)) 2012-09-15 12:41:35 +00:00
88.67.98.182
e804d96a09 poll vote (My phone (or MP3 player)) 2012-09-15 09:40:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmU_2tE75oyG0h2ZPN4lcroIKEMC8G-otE
071a73212f poll vote (My phone (or MP3 player)) 2012-09-15 07:58:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmU_2tE75oyG0h2ZPN4lcroIKEMC8G-otE
3ffbd76267 poll vote (Google Drive) 2012-09-15 07:58:12 +00:00
37.14.174.110
4360ce62b6 poll vote (My phone (or MP3 player)) 2012-09-15 00:33:20 +00:00
196.210.205.176
77db311489 poll vote (My phone (or MP3 player)) 2012-09-14 20:46:10 +00:00
216.203.6.11
3dea341433 poll vote (Amazon S3) 2012-09-14 20:09:53 +00:00
82.36.235.9
735d0300e3 poll vote (Amazon S3) 2012-09-14 19:42:19 +00:00
85.84.130.12
2fda03c46f poll vote (Google Drive) 2012-09-14 17:41:37 +00:00
142.103.22.67
69d474d7e2 poll vote (My phone (or MP3 player)) 2012-09-14 17:32:46 +00:00
194.167.235.220
e83052b916 poll vote (My phone (or MP3 player)) 2012-09-14 16:32:14 +00:00
108.202.177.46
2667e58eef poll vote (Amazon S3) 2012-09-14 14:37:32 +00:00
2001:8b0:641b:0:240:f4ff:fe51:2b8f
d3aee0b85e poll vote (My phone (or MP3 player)) 2012-09-14 13:44:19 +00:00
61.16.175.58
6e4ad78135 poll vote (Amazon S3) 2012-09-14 12:59:04 +00:00
81.110.190.38
b421a08d86 poll vote (Amazon Glacier) 2012-09-14 12:28:17 +00:00
134.34.1.246
afc5fb8291 poll vote (OpenStack SWIFT) 2012-09-14 11:20:52 +00:00
134.109.4.210
f76ab022f2 poll vote (My phone (or MP3 player)) 2012-09-14 10:40:26 +00:00
134.93.131.80
7f5b073e69 poll vote (My phone (or MP3 player)) 2012-09-14 09:03:42 +00:00
80.138.120.93
bfe58eee87 poll vote (OpenStack SWIFT) 2012-09-14 08:56:49 +00:00
204.210.141.90
ebcac59a07 poll vote (Amazon S3) 2012-09-14 08:06:55 +00:00
130.206.138.233
225c7d44e3 poll vote (Google Drive) 2012-09-14 08:06:02 +00:00
195.81.3.249
2f88f683e0 poll vote (My phone (or MP3 player)) 2012-09-14 07:52:37 +00:00
93.137.114.136
d4605eee8d poll vote (My phone (or MP3 player)) 2012-09-14 07:49:24 +00:00
193.29.115.250
dfcf907069 poll vote (Google Drive) 2012-09-14 07:33:50 +00:00
193.29.115.250
9b85c3eb37 poll vote (Box.com) 2012-09-14 07:33:43 +00:00
78.144.72.66
dbfa65a6c5 poll vote (My phone (or MP3 player)) 2012-09-14 07:11:10 +00:00