Commit graph

15349 commits

Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU
c32bb3e93d Added a comment: Easy to fix. 2013-11-14 20:36:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU
5e86f0b273 added a gpg bug 2013-11-14 20:30:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw
75f63d3bf6 Added a comment 2013-11-14 19:22:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU
bf9afe9972 Added a comment: Using a portable drive as another transfer device? – cool. 2013-11-14 19:05:56 +00:00
http://joeyh.name/
a3fc60f524 Added a comment 2013-11-14 18:55:55 +00:00
Joey Hess
0f40a80f97 update test suite for status -> info rename 2013-11-14 14:42:18 -04:00
Joey Hess
cb02104fea fix 2013-11-14 14:38:23 -04:00
Joey Hess
48dc72781f format 2013-11-14 14:38:08 -04:00
Joey Hess
2a297dd6d1 on second thought, don't change sync to exit nonzero on successful conflicted merge resolution
For one thing, that breaks the test suite. May revisit later.
2013-11-14 14:36:48 -04:00
Joey Hess
ac000241b5 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-14 14:29:57 -04:00
Joey Hess
4c5850a17f mavericks 2013-11-14 14:18:29 -04:00
Joey Hess
2d0a05c0fe add a note after successful conflicted merge resolution 2013-11-14 14:18:15 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
e0fd95d0af Added a comment 2013-11-14 18:06:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlHNJ7FpiXJNwSmojlwKwXhhF5QvwpNPmI
de6c04fc9e Added a comment: Confirmed 2013-11-14 17:57:23 +00:00
Joey Hess
b0f7c80378 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-14 13:50:19 -04:00
Joey Hess
69d68f9d53 work around OSX mavericks' broken cpp 2013-11-14 13:49:11 -04:00
http://joeyh.name/
335eeb6f9a Added a comment 2013-11-14 17:10:55 +00:00
http://joeyh.name/
920cdb68e2 Added a comment 2013-11-14 17:06:52 +00:00
Joey Hess
82dcf33482 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-14 12:46:50 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
a5630e988b 2013-11-14 16:21:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
2a4a72cbf8 2013-11-14 16:20:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
223c37feef 2013-11-14 16:20:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
467d576560 2013-11-14 16:18:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
ba8031a314 2013-11-14 15:26:19 +00:00
http://joeyh.name/
e3bf069e41 Added a comment 2013-11-14 15:26:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
b6659be44b 2013-11-14 15:25:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
8c3c7799ba Added a comment 2013-11-14 14:58:11 +00:00
http://id.clacke.se/
c0501bb4be Added a comment 2013-11-14 10:00:20 +00:00
gueux
9023037e70 2013-11-14 09:19:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmbo-yMzW_lkBrS4ICNn5XMr8saYtI1_WY
981544217c Added a comment: Any further info regarding gitolite support? 2013-11-14 03:20:32 +00:00
Joey Hess
6049119628 copied a very interesting comment from the poll site 2013-11-13 20:59:17 -04:00
Joey Hess
c7bb7b1d46 Merge branch 'master' of ssh://git-annex.branchable.com
Conflicts:
	doc/polls/2013/direct_vs_indirect_mode.mdwn
	doc/polls/2013/number_of_repositories.mdwn
	doc/polls/2013/using_for.mdwn
2013-11-13 20:02:48 -04:00
https://id.koumbit.net/anarcat
34bdf220f5 poll vote (personal data) 2013-11-14 00:02:15 +00:00
Joey Hess
86871f270b polls moved (and synced) 2013-11-13 20:01:55 -04:00
https://id.koumbit.net/anarcat
071fc2d29b poll vote (6-10) 2013-11-14 00:01:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn1QhtPvsRBV7pfaDW_ZTPFv_ZIxSzQ8Rg
cd4e876e94 poll vote (I use mostly direct mode) 2013-11-14 00:01:39 +00:00
Joey Hess
da2dd4bf33 moving to separate site 2013-11-13 20:00:28 -04:00
https://id.koumbit.net/anarcat
a92fe54f10 Added a comment: quite happy 2013-11-13 23:59:30 +00:00
https://id.koumbit.net/anarcat
c95993fe06 poll vote (videos) 2013-11-13 23:58:38 +00:00
https://id.koumbit.net/anarcat
334bb121ee poll vote (music) 2013-11-13 23:56:09 +00:00
https://id.koumbit.net/anarcat
42a499c37e poll vote (happy) 2013-11-13 23:49:13 +00:00
http://joeyh.name/
1ac656e3f0 poll vote (completely ecstatic) 2013-11-13 23:48:11 +00:00
https://id.koumbit.net/anarcat
ee682bd344 poll vote (know it very well) 2013-11-13 23:47:12 +00:00
82.113.99.172
98772809f7 poll vote (10+ GB) 2013-11-13 23:46:14 +00:00
216.145.77.95
30ebbee593 poll vote (completely ecstatic) 2013-11-13 23:43:59 +00:00
66.249.81.157
76c818cfde poll vote (happy) 2013-11-13 23:42:51 +00:00
https://id.koumbit.net/anarcat
f72409d037 poll vote (Linux) 2013-11-13 23:41:35 +00:00
217.129.96.222
4d9ffaa52e poll vote (I install the version provided by my OS distributor) 2013-11-13 23:40:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ
0941838591 poll vote (11-20) 2013-11-13 23:39:17 +00:00
89.214.35.87
d70d4d836e poll vote (2-5) 2013-11-13 23:38:12 +00:00