Commit graph

2316 commits

Author SHA1 Message Date
Joey Hess
6bbbe6fa5d update 2013-10-18 15:20:44 -04:00
Joey Hess
30ca7805d6 update 2013-10-18 15:11:17 -04:00
Joey Hess
50684ea7bf Merge branch 'master' of ssh://git-annex.branchable.com 2013-10-18 14:04:13 -04:00
Joey Hess
c027dcf9f4 detailed design for git repository repair 2013-10-18 14:00:27 -04:00
107.1.64.82
7530307a84 poll vote (/sdcard/annex) 2013-10-18 15:22:26 +00:00
80.81.0.171
4ac6d1b3d7 poll vote (/sdcard/annex) 2013-10-18 12:25:56 +00:00
Joey Hess
e5e4b80b09 add support for weekly, monthly, and yearly schedules that run on no specific day 2013-10-15 13:27:21 -04:00
Joey Hess
7b82f431ba need to improve Recurrance 2013-10-14 16:40:48 -04:00
Joey Hess
293f3d2a59 update 2013-10-14 16:29:34 -04:00
Joey Hess
1a4c1d0917 devblog 2013-10-13 17:21:05 -04:00
Joey Hess
e7a134208c update 2013-10-11 17:33:51 -04:00
Joey Hess
1b7b397bdf update 2013-10-10 18:09:06 -04:00
Joey Hess
feef7d3800 devblog 2013-10-05 17:26:17 -04:00
Joey Hess
891242ad26 another lock file 2013-10-03 17:05:53 -04:00
Joey Hess
93dbb7842e watcher: Detect at startup time when there is a stale .git/lock, and remove it so it does not interfere with the automatic commits of changed files. 2013-10-03 16:57:21 -04:00
Joey Hess
7286fbd93e gcrypt basically done 2013-10-01 19:12:08 -04:00
Joey Hess
76421872d1 notes 2013-09-17 20:08:44 -04:00
77.22.198.109
519774e5da poll vote (/sdcard/annex) 2013-09-17 19:43:26 +00:00
41.151.39.112
e330985122 poll vote (Whole /sdcard) 2013-09-13 20:06:42 +00:00
http://droggl.myopenid.com/
67f1181694 Added a comment 2013-09-11 11:55:27 +00:00
107.1.64.82
3ecb852b4a poll vote (/sdcard/annex) 2013-09-06 14:41:58 +00:00
82.243.233.186
f0dd323d46 poll vote (Tahoe-LAFS) 2013-09-06 05:55:49 +00:00
109.190.97.30
a3fe5c1971 poll vote (Tahoe-LAFS) 2013-09-05 23:14:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxlx1UrzVhdy6_gFjzmF42x6QXxBUxg00
9551dca9c8 poll vote (/sdcard/annex) 2013-09-05 12:16:43 +00:00
2.244.15.209
b04957628d poll vote (/sdcard/annex) 2013-09-05 11:06:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
7740afd10f Added a comment: New YouTube problems 2013-09-05 03:45:16 +00:00
Joey Hess
484daf5b39 fix pagespec 2013-08-28 17:43:18 -04:00
Joey Hess
719e6e3709 move post to other blog 2013-08-28 17:41:55 -04:00
Joey Hess
47acd6aee5 new devblog for new year of crowdfunded development 2013-08-28 17:40:09 -04:00
Joey Hess
5ff6fce61a fix 2013-08-28 17:27:39 -04:00
Joey Hess
07a8a59dc6 blog for the day 2013-08-28 17:21:52 -04:00
Joey Hess
c4fcb20d02 blog for the day 2013-08-26 22:03:37 -04:00
Joey Hess
22d649d6e3 blog for the day 2013-08-25 21:46:04 -04:00
Joey Hess
2794f4fb48 blog for the day 2013-08-24 16:03:32 -04:00
Joey Hess
f274b6bbd0 blog for the day 2013-08-22 18:57:02 -04:00
GLITTAH
0f2cbdfad5 Added a comment 2013-08-20 22:42:48 +00:00
Joey Hess
42eeac1451 blog for the day 2013-08-20 16:03:04 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlpSOjMH7Iaz56v6Pr9KCFSpbvMXvg-y9o
45109f35f5 Added a comment: That's amazing... 2013-08-17 11:18:05 +00:00
94.211.35.149
821a482608 poll vote (Tahoe-LAFS) 2013-08-17 09:06:23 +00:00
80.83.50.102
c4fbda6c1f poll vote (OpenStack SWIFT) 2013-08-16 13:51:39 +00:00
Joey Hess
624cfebb0c catchup blog 2013-08-15 11:06:31 +02:00
145.120.12.49
8140a62cb0 poll vote (/sdcard/annex) 2013-08-12 09:41:14 +00:00
Joey Hess
a91dfef16c Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-06 13:35:27 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm72W-CH7bzZ8uHvaw1KJGrToPSQDNBnIA
a613117b82 Added a comment: bup splitting 2013-08-05 17:13:14 +00:00
Joey Hess
9a75457f70 blog for the day 2013-08-04 19:18:42 -04:00
http://adamspiers.myopenid.com/
5202e1a940 Added a comment: This makes me happy :-) 2013-08-04 00:46:26 +00:00
Joey Hess
17f05d6572 blog for the day 2013-08-02 20:38:57 -04:00
Joey Hess
b191d5c595 gitignore support for the assistant and watcher
Requires git 1.8.4 or newer. When it's installed, a background
git check-ignore process is run, and used to efficiently check ignores
whenever a new file is added.

Thanks to Adam Spiers, for getting the necessary support into git for this.

A complication is what to do about files that are gitignored but have
been checked into git anyway. git commands assume the ignore has been
overridden in this case, and not need any more overriding to commit a
changed version.

However, for the assistant to do the same, it would have to run git ls-files
to check if the ignored file is in git. This is somewhat expensive. Or it
could use the running git-cat-file process to query the file that way,
but that requires transferring the whole file content over a pipe, so it
can be quite expensive too, for files that are not git-annex
symlinks.

Now imagine if the user knows that a file or directory tree will be getting
frequent changes, and doesn't want the assistant to sync it, so gitignores
it. The assistant could overload the system with repeated ls-files checks!

So, I've decided that the assistant will not automatically commit changes
to files that are gitignored. This is a tradeoff. Hopefully it won't be a
problem to adjust .gitignore settings to not ignore files you want the
assistant to autocommit, or to manually git annex add files that are listed
in .gitignore.

(This could be revisited if git-annex gets access to an interface to check
the content of the index w/o forking a git command. This could be libgit2,
or perhaps a separate git cat-file --batch-check process, so it wouldn't
need to ship over the whole file content.)

This commit was sponsored by Francois Marier. Thanks!
2013-08-02 20:37:03 -04:00
Joey Hess
bb74db6ef0 blog for the day 2013-08-01 17:33:04 -04:00
https://launchpad.net/~mikapflueger
b640a5941b Added a comment: Thank you so much! 2013-08-01 01:13:53 +00:00
Richard Hartmann
0afe0273cb Typo 2013-08-01 01:16:27 +02:00
Joey Hess
3a1e458e0a blog for the day 2013-07-31 16:47:30 -04:00
http://joeyh.name/
890bf1a750 Added a comment 2013-07-31 20:03:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
9545d3420c Added a comment: Horns? 2013-07-31 19:53:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
209a0ca0fa removed 2013-07-31 19:53:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
3cce0d51e6 Added a comment: Horns? 2013-07-31 19:52:42 +00:00
Joey Hess
19adb2a7cf blog for the day 2013-07-30 17:06:18 -04:00
Joey Hess
fdb6593b90 blog for the day 2013-07-28 18:35:07 -04:00
Joey Hess
750fe0cbf2 update 2013-07-27 20:55:50 -04:00
Joey Hess
3611de5864 blog for the day 2013-07-27 19:07:37 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlUbH3eytydcwlWqv8oauE2Jg4NwcV9uA0
ecc23cda38 Added a comment: A good day to be the sponsor! 2013-07-27 12:31:28 +00:00
Joey Hess
70d3116c43 blog for the day 2013-07-26 19:52:14 -04:00
Joey Hess
375f8fafd6 update 2013-07-26 01:20:09 -04:00
Joey Hess
8b5549b8ca blog for the day 2013-07-25 16:15:04 -04:00
http://joeyh.name/
d10dfefa28 Added a comment 2013-07-25 18:22:51 +00:00
http://edward.myopenid.com/
152e4eac00 fix typo: Once way -> One way 2013-07-25 10:51:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlnoH5btjn_BLib3_IhES5uMhrzuOiwCYo
e6482b2ad7 Added a comment: windows port 2013-07-25 07:50:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7AuSfii_tCkLyspL6Mr0ATlO6OxLNYOo
372d88c349 Added a comment: for OSX, package managers (homebrew and macports) are really second-class 2013-07-24 07:24:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmnG4EuvZWse5hvgrl0XAK-U61e-0iGaao
010c04ce25 Added a comment: Broken dependencies on Debian wheezy 2013-07-24 07:21:18 +00:00
Sagi
9b18f13d81 Added a comment: Why not use OTR? 2013-07-23 23:53:12 +00:00
Joey Hess
914323dc06 blog for the day 2013-07-23 18:51:04 -04:00
Joey Hess
17016017d8 roadmap for next year's work 2013-07-23 18:46:09 -04:00
Joey Hess
4ad7726d67 blog for the day 2013-07-22 17:59:39 -04:00
94.211.35.149
cfd0b46175 poll vote (Tahoe-LAFS) 2013-07-22 15:40:21 +00:00
https://launchpad.net/~mikapflueger
9e23a35a49 Added a comment: The dreaded "ü" 2013-07-21 20:56:30 +00:00
Joey Hess
55ef16f179 blog for the day 2013-07-20 19:47:57 -04:00
Joey Hess
4e718b7d7c blog for the day 2013-07-18 20:12:47 -04:00
Joey Hess
07e89a1bd2 blog for the day 2013-07-17 18:46:19 -04:00
http://grossmeier.net/
c5630af9cb Added a comment: uninit 2013-07-16 23:43:38 +00:00
Joey Hess
95219dae61 blog for the day 2013-07-16 19:07:45 -04:00
https://dzsino.myopenid.com/
001b5d236b Added a comment: mo' stickers, less problems :) 2013-07-16 09:56:03 +00:00
96.42.106.97
606d87cf4d poll vote (My phone (or MP3 player)) 2013-07-15 15:53:25 +00:00
77.172.73.184
de1fa2e7ef poll vote (/sdcard/annex) 2013-07-15 14:57:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm3RqHNOKdnMCRF5V4306ON55XyJtQNlpY
02f3d0489d Added a comment: BitSync 2013-07-15 13:11:03 +00:00
http://sunny256.sunbase.org/
03efd38d30 Added a comment: git-annex is teh awesome 2013-07-15 12:37:57 +00:00
2a04:2500:0:d00:c979:419a:4357:30b2
67f55d296c poll vote (OpenStack SWIFT) 2013-07-15 09:10:26 +00:00
128.78.68.48
8470c571e4 poll vote (OpenStack SWIFT) 2013-07-15 09:02:16 +00:00
http://joeyh.name/
47e9e33c82 Added a comment 2013-07-15 05:26:54 +00:00
EskildHustvedt
51f51fc6d1 Added a comment: Shipping costs 2013-07-15 05:07:07 +00:00
Joey Hess
146338581a update 2013-07-14 19:09:08 -04:00
Joey Hess
c012207408 blog for the day! 2013-07-14 19:04:06 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
e4e6260a90 Added a comment 2013-07-14 16:03:39 +00:00
Joey Hess
13d8fb4b2d blog for the day 2013-07-11 19:22:27 -04:00
LP
f4d32d8a4c Added a comment: Just to say.. 2013-07-10 23:01:56 +00:00
Joey Hess
9dac79a018 blog for the day 2013-07-09 20:50:29 -04:00
http://nullroute.eu.org/~grawity/
a94375cf83 Added a comment 2013-07-09 13:48:50 +00:00
http://nullroute.eu.org/~grawity/
b555bbef59 Added a comment 2013-07-09 13:47:20 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
54ad6972f5 Added a comment 2013-07-09 07:18:09 +00:00
http://cweiske.de/
131d68862d Added a comment 2013-07-09 06:52:11 +00:00
http://cweiske.de/
118c923116 link bug 2013-07-09 06:50:03 +00:00
Joey Hess
d8a82a65e2 S3 download progress bars TODO 2013-07-08 18:00:52 -04:00
Joey Hess
2980afe4a6 remove TODO item that turns out to be already done 2013-07-08 17:58:10 -04:00
Joey Hess
978e502e54 blog for the day 2013-07-08 16:37:16 -04:00
Joey Hess
ea12e0ff8f TCP over XMPP 2013-07-08 12:34:09 -04:00
Joey Hess
212b6ef8e0 Merge branch 'master' of ssh://git-annex.branchable.com 2013-07-08 12:12:47 -04:00
98.64.216.229
d6e992b308 poll vote (/sdcard/annex) 2013-07-08 02:59:30 +00:00
2.244.19.79
181336f337 poll vote (Google Drive) 2013-07-07 22:42:12 +00:00
Joey Hess
115d79515f blog 2013-07-07 15:04:33 -04:00
http://joeyh.name/
42ffbbc8ab Added a comment 2013-07-07 17:20:05 +00:00
sfs
5afedbccd3 Added a comment: See history of a file 2013-07-07 00:49:35 +00:00
65.24.116.99
1ddc3b8273 poll vote (/sdcard/annex) 2013-07-06 02:27:51 +00:00
93.223.164.113
22ba8d51f1 poll vote (Whole /sdcard) 2013-07-05 23:13:17 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm0sGxsiJ7yj5iQsF-A5tEl6XKOGQieqEo
1fb0584a37 Added a comment: Writing papers 2013-07-04 15:32:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmhfodZquCI_EEl-f3h7HkROTszlsQL6yA
d21aab2d3b Added a comment 2013-07-04 12:41:36 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
ca1a79cd03 Added a comment 2013-07-03 22:16:32 +00:00
Joey Hess
2039cc5676 blog for the day 2013-07-03 15:55:02 -04:00
GLITTAH
45534e758d Added a comment: Forgot to add... 2013-07-03 19:28:42 +00:00
http://joeyh.name/
80a399e90d Added a comment 2013-07-03 15:51:48 +00:00
GLITTAH
e7bf574597 Added a comment: Several annexes managing >3TB. No problems! 2013-07-02 00:12:28 +00:00
85.170.116.133
e69075f0be poll vote (/sdcard/annex) 2013-07-01 07:51:36 +00:00
2001:7b8:312:0:a8b1:a6e7:1968:6aeb
d8b92b4d85 poll vote (/sdcard/annex) 2013-06-30 20:55:29 +00:00
https://dzsino.myopenid.com/
97ee6c0b3f Added a comment: thanks! 2013-06-30 13:10:35 +00:00
http://jasonwoof.com/
70c4ef603a Added a comment: It's been great! 2013-06-29 03:48:09 +00:00
EvanDeaubl
69ee54c73e Added a comment 2013-06-28 18:35:55 +00:00
216.115.165.4
de01147e85 poll vote (Google Drive) 2013-06-28 00:59:19 +00:00
Joey Hess
3e09e35924 Merge branch 'master' of ssh://git-annex.branchable.com 2013-06-27 16:28:05 -04:00
http://julien.lefrique.name/
dafdd215bf Added a comment: Many thanks! 2013-06-27 19:59:47 +00:00
Joey Hess
3fafbf15a6 blog for the day 2013-06-27 15:44:55 -04:00
http://joeyh.name/
43d8a1e5bf Added a comment 2013-06-27 18:11:45 +00:00
http://joeyh.name/
845093476e Added a comment 2013-06-27 18:11:03 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmnG4EuvZWse5hvgrl0XAK-U61e-0iGaao
bdf618e8a1 Added a comment: Nothing fancy but... 2013-06-27 16:52:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlOc-EOD5ZyggsAp6lOnU7x5MxizwLtUXA
34c1e7ec11 Added a comment: more success 2013-06-27 14:09:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnAvbXOnK57sqgvZvxkbG74NUKBDwKDcuk
cf8dcbacc1 Added a comment: Backups 2013-06-27 13:14:43 +00:00
http://joeyh.name/
728b27ae2f Added a comment 2013-06-27 06:31:29 +00:00
andy
8f9bf584c5 Added a comment: Another success story 2013-06-27 02:03:00 +00:00
Richard Hartmann
65bbd063dc Merge branch 'master' of git://git-annex.branchable.com 2013-06-27 00:20:55 +02:00
Richard Hartmann
85788afae5 Fix link in old blog post 2013-06-27 00:20:41 +02:00
Joey Hess
3187f0ae86 blog for the day 2013-06-26 18:13:02 -04:00
http://joeyh.name/
cc050e5e82 Added a comment 2013-06-26 19:39:15 +00:00
http://nicolas-schodet.myopenid.com/
e55bc6feca Added a comment: Thank you for this great tool! 2013-06-26 18:10:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl3A5oeZFLreGhDTFVMOJYIy1auKiTL_ZY
afe452879c Added a comment: :) 2013-06-26 15:04:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
8e61a9424a Added a comment 2013-06-26 08:36:33 +00:00
https://launchpad.net/~subito
cfb577db0a Added a comment: Big success! 2013-06-26 07:00:16 +00:00
46.115.86.1
8341d42745 poll vote (/sdcard/annex) 2013-06-26 03:34:39 +00:00
http://edheil.wordpress.com/
8685af7df2 Added a comment 2013-06-25 22:26:27 +00:00
Joey Hess
5e2b5ebd15 blog for the day 2013-06-25 17:32:50 -04:00
http://joeyh.name/
28d012d3b4 Added a comment 2013-06-25 17:12:17 +00:00
Richard Hartmann
b0b79af9cd Typo, grammar, and formatting 2013-06-22 14:54:23 +02:00
Joey Hess
cd282b5a67 blog for the day 2013-06-21 20:45:57 -04:00
36.83.109.27
7555e4ced7 poll vote (Tahoe-LAFS) 2013-06-21 15:01:31 +00:00
Joey Hess
903bb8caf3 fix date 2013-06-18 17:14:28 -04:00
Joey Hess
6133811308 Merge branch 'master' of ssh://git-annex.branchable.com 2013-06-18 16:52:44 -04:00
Joey Hess
36ef25553b blog for the day 2013-06-18 16:45:55 -04:00
Richard Hartmann
333cb8e79b Typo and broken link 2013-06-18 08:22:33 +02:00
Joey Hess
bcb5613c46 blog for the day 2013-06-17 21:44:21 -04:00
Richard Hartmann
d0a68e2260 Typo 2013-06-17 01:15:19 +02:00
Joey Hess
e7b4d7320e blog for the day 2013-06-14 18:20:35 -04:00
Joey Hess
fe53456c1d Merge branch 'master' of ssh://git-annex.branchable.com 2013-06-14 11:53:59 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkDb5BRI8VzliQuKRVM7NwMdudvxiUNPHI
941d357d2c Added a comment: git annex add on Win7 NTFS 2013-06-14 09:26:24 +00:00
Joey Hess
4193479013 thoughts on encryption 2013-06-13 21:38:07 -04:00
Joey Hess
304d7e5089 blog for the day 2013-06-12 19:52:57 -04:00
http://edward.myopenid.com/
61bd70fb89 correct typo 2013-06-11 14:00:14 +00:00
http://joeyh.name/
a1d0d0f6e3 Added a comment 2013-06-10 23:50:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlJ2utMQgMEYAOs3Dfc6eZRyUzt4acNXUU
a713bd2f73 Added a comment 2013-06-10 23:42:20 +00:00
Joey Hess
033e00d981 blog for the day 2013-06-10 17:21:07 -04:00
188.28.32.165
053092b470 poll vote (/sdcard/annex) 2013-06-10 13:24:01 +00:00
82.225.168.180
3427c67c1b poll vote (Whole /sdcard) 2013-06-07 16:32:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM
77b05d9e12 Added a comment 2013-06-04 12:51:20 +00:00
Joey Hess
1f8a1f843c Merge branch 'master' of ssh://git-annex.branchable.com 2013-06-03 19:15:09 -04:00
Joey Hess
531efdadee blog for the vacation 2013-06-03 19:14:22 -04:00
93.129.89.68
f268d12cbc poll vote (Amazon S3 (done)) 2013-06-03 10:54:46 +00:00
173.11.84.230
e26e7d11c5 poll vote (Google Drive) 2013-06-03 06:02:40 +00:00
75.149.35.29
ceab0f35be poll vote (/sdcard/annex) 2013-06-01 23:28:30 +00:00
Richard Hartmann
529c7d2ede Typo, grammar, and HTML caret 2013-06-01 22:52:57 +02:00
Joey Hess
5df09b5777 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-31 21:36:43 -04:00
Joey Hess
ac2da684f8 blog for the day 2013-05-31 21:36:14 -04:00
Richard Hartmann
cbd41ab11a Moderation 2013-05-31 23:42:57 +02:00
Joey Hess
ce9189ae1a blog for the day 2013-05-30 21:49:17 -04:00
http://joeyh.name/
7209645213 Added a comment 2013-05-29 16:30:20 +00:00
Joey Hess
3571ca7d36 blog for the day 2013-05-28 19:26:07 -04:00
Richard Hartmann
8aaf2023fa Typos 2013-05-28 09:10:06 +02:00
https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM
20d84016ff Added a comment 2013-05-28 03:23:51 +00:00
Joey Hess
2afca7a8f6 blog for the da 2013-05-27 18:18:20 -04:00
79.207.25.10
2928fdb466 poll vote (/sdcard/annex) 2013-05-27 06:39:56 +00:00
Joey Hess
18b92f97fe blog for the 1/2 day 2013-05-26 18:42:50 -04:00
Joey Hess
90069a32c2 blog for the days 2013-05-25 16:08:29 -04:00
Joey Hess
f3640baca0 blog for the day 2013-05-23 19:16:29 -04:00
Joey Hess
94738975e7 blog for the day 2013-05-22 17:22:49 -04:00
Joey Hess
99324eac9a XMPP: Send pings and use them to detect when contact with the server is lost.
I noticed that when my modem hung up and redialed, my xmpp client was left
sending messages into the void. This will also handle any idle
disconnection issues.
2013-05-22 17:03:46 -04:00
Joey Hess
c1e10d2241 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-22 13:10:16 -04:00
Joey Hess
2cf0e548bb todo 2013-05-22 10:40:49 -04:00
Richard Hartmann
6ee940ca7a Typos 2013-05-22 06:43:53 +02:00
Joey Hess
20710d4c24 blog for the day 2013-05-21 19:35:35 -04:00
Joey Hess
08c03b2af3 XMPP: Avoid redundant and unncessary pushes. Note that this breaks compatibility with previous versions of git-annex, which will refuse to accept any XMPP pushes from this version. 2013-05-21 18:24:29 -04:00
Joey Hess
700d5683a9 Merge branch 'master' into xmpp
Conflicts:
	debian/changelog
	doc/design/assistant/more_cloud_providers.mdwn
2013-05-21 15:54:47 -04:00
Joey Hess
ceb600d715 lift megaannex comment into tip, etc 2013-05-21 13:28:09 -04:00
Joey Hess
df3203ec62 flir 2013-05-21 08:23:20 -04:00
Joey Hess
230aed671f XMPP: Ignore duplicate messages received when pushing. 2013-05-20 21:58:59 -04:00
Joey Hess
69a1529c89 flickr 2013-05-20 19:22:22 -04:00
Joey Hess
a0885d7ce4 blog for the day 2013-05-20 18:49:37 -04:00