Commit graph

13049 commits

Author SHA1 Message Date
Joey Hess
b46afa29ac implement import --deduplicate and import --clean-duplicates
Note that --deduplicate currently checksums each file twice,
once to see if it's a known key, and once when importing it.

Perhaps this could be revisited and the extra checksum gotten rid of,
at the cost of not locking down the file when adding it.
2013-08-20 11:00:52 -04:00
Joey Hess
e240cb99f7 Merge branch 'duplicate'
Conflicts:
	debian/changelog
2013-08-20 10:27:24 -04:00
Joey Hess
2ed1089d9d Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-17 21:30:13 +02:00
Joey Hess
a6a047192e sync, merge: Bug fix: Don't try to merge into master when in a bare repo. 2013-08-17 21:29:44 +02:00
http://olivier.berger.myopenid.com/
a248224c4f Added a comment: rsync remote is basically more intended for backups ? 2013-08-17 17:40:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawle_3FsPDpTLXEiEVv1oPfXG1kAqOc5JUk
8b2a931c01 2013-08-17 15:57:53 +00:00
https://id.koumbit.net/anarcat
6480160315 backport affected too 2013-08-17 15:49:01 +00:00
https://id.koumbit.net/anarcat
4e19d949c7 add debugging info 2013-08-17 15:16:41 +00:00
https://id.koumbit.net/anarcat
efd1f6b6eb add version defailts for angela 2013-08-17 15:13:29 +00:00
https://id.koumbit.net/anarcat
f0479bbca3 will add details 2013-08-17 15:10:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
9fe751329e removed 2013-08-17 13:45:21 +00: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
http://joeyh.name/
a14c8cec75 Added a comment 2013-08-17 08:59:11 +00:00
http://olivier.berger.myopenid.com/
eca54a22cf Added a comment: Except I don't have rsync/sftp on the NAS AFAICT 2013-08-17 08:56:37 +00:00
http://olivier.berger.myopenid.com/
ff8b633c7f Added a comment: Which URL prefix are supported ? 2013-08-17 08:44:07 +00:00
http://cstork.org/
156d18f3c7 Added a comment: Similar to "direct special remotes" 2013-08-16 17:57:27 +00:00
http://openid.yandex.ru/deletesoftware/
34d0102ba8 removed 2013-08-16 14:52:47 +00:00
http://openid.yandex.ru/deletesoftware/
19a6f92a9c Added a comment: duplicate 2013-08-16 14:52:23 +00:00
http://openid.yandex.ru/deletesoftware/
418e7864eb Added a comment: duplicate 2013-08-16 14:47:24 +00:00
http://olivier.berger.myopenid.com/
683b655d7f 2013-08-16 14:39:08 +00:00
Joey Hess
6b4b2a6515 Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-16 15:56:56 +02:00
Joey Hess
74aa525444 wheezy backport now available 2013-08-16 15:56:12 +02:00
80.83.50.102
c4fbda6c1f poll vote (OpenStack SWIFT) 2013-08-16 13:51:39 +00:00
http://openid.yandex.ru/deletesoftware/
7d6b60426f 2013-08-16 12:09:45 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
e53b93e57e Added a comment 2013-08-16 09:14:52 +00:00
Joey Hess
641b14b124 Debian: Recommend ssh-askpass, which ssh will use when the assistant is run w/o a tty. Closes: #719832 2013-08-16 10:07:44 +02:00
http://www.joachim-breitner.de/
ebcc7400d3 Added a comment: --fast and --relaxed 2013-08-16 07:27:59 +00:00
http://www.joachim-breitner.de/
5c8a4f6fc4 2013-08-16 07:20:23 +00:00
guilhem
d8e24d5ddb Added a comment 2013-08-16 07:14:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo
ef8220827a Added a comment 2013-08-16 03:42:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8
e1a9cc349f 2013-08-15 21:19:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawliqfHEW134uawIUPwyKiyOdoF-oI5TxnQ
c83fb5f012 Added a comment: Doh. /usr/bin/ssh-askpass needs to be on *local* machine. 2013-08-15 20:13:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmRpGORNKWimtzqItvwm4I6cn16vx8OvU
f5829d0fb7 Added a comment: Many network sockets with associated fds hanging around 2013-08-15 18:00:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8
244b14d14d 2013-08-15 17:28:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8
1b4da07d67 2013-08-15 16:02:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8
16d775d4f4 Removing: Facebook requires no TLS, so extremely unsafe. LoL requires SSL. 2013-08-15 14:41:20 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8
a4469b9157 2013-08-15 14:03:51 +00:00
Joey Hess
dfa02356f1 Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-15 15:51:19 +02:00
Joey Hess
59f9781a23 Debian: Run the builtin test suite as an autopkgtest. 2013-08-15 15:49:19 +02:00
https://www.google.com/accounts/o8/id?id=AItOawmWg4VvDTer9f49Y3z-R0AH16P4d1ygotA
f5bfd549f4 order 2013-08-15 11:41:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmWg4VvDTer9f49Y3z-R0AH16P4d1ygotA
a8db8f4398 2013-08-15 11:41:37 +00:00
Joey Hess
624cfebb0c catchup blog 2013-08-15 11:06:31 +02:00
Joey Hess
4ed18290bf add news item for git-annex 4.20130815 2013-08-15 11:03:24 +02:00
http://joeyh.name/
5bc52664c4 Added a comment 2013-08-15 09:02:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlRngApnOQddLD3-EHS8RM_E0Ut3MQdvcE
2664ff0c2c 2013-08-15 08:59:46 +00:00
Joey Hess
88945f3d55 Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-15 10:48:56 +02:00
Joey Hess
572d6fde14 releasing version 4.20130815 2013-08-15 10:46:33 +02:00
https://www.google.com/accounts/o8/id?id=AItOawmWg4VvDTer9f49Y3z-R0AH16P4d1ygotA
0f56380995 2013-08-15 08:40:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmWg4VvDTer9f49Y3z-R0AH16P4d1ygotA
885d0d0059 2013-08-15 08:28:02 +00:00