Commit graph

23967 commits

Author SHA1 Message Date
Joey Hess
cf306c261b update for jessie 2015-04-29 17:02:57 -04:00
tomekwi
9d147c5018 Added a comment 2015-04-29 20:38:51 +00:00
Joey Hess
1693c0dcd2 Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-29 15:53:19 -04:00
Joey Hess
995643665a Improve integration with KDE's file manager to work with dolphin version 14.12.3 while still being compatable with 4.14.2. Thanks, silvio. 2015-04-29 15:53:16 -04:00
silvio
bc41468279 Added a comment 2015-04-29 19:47:21 +00:00
silvio
22eafb112f Added a comment 2015-04-29 19:39:33 +00:00
silvio
9d745434f9 Added a comment 2015-04-29 19:24:55 +00:00
CandyAngel
885b39b183 Added a comment 2015-04-29 18:42:38 +00:00
Joey Hess
38403092ae revert reversion merged from propellor 2015-04-29 14:15:08 -04:00
Joey Hess
de3c8ae6d5 comment 2015-04-29 14:07:03 -04:00
Joey Hess
79d1b378ce comment 2015-04-29 14:05:12 -04:00
Joey Hess
c3938052d9 comment 2015-04-29 14:04:08 -04:00
Joey Hess
d8ad1d5503 import: Don't stop entire import when one file fails due to being gitignored or conflicting with something in the work tree. 2015-04-29 13:56:41 -04:00
Joey Hess
548037223c comments 2015-04-29 13:49:09 -04:00
Joey Hess
2e54251c18 import: Check for gitignored files before moving them into the tree. (Needs git 1.8.4 or newer.) 2015-04-29 13:46:12 -04:00
Joey Hess
d8ffa498ef avoid dupicate bracket import errror
Ambiguous occurrence `bracket'
    It could refer to either `Control.Exception.bracket',
                             imported from `Control.Exception' at Utility/FileMode.hs:14:27-33
                             (and originally defined in `Control.Exception.Base')
                          or `Utility.Exception.bracket',
                             imported from `Utility.Exception' at Utility/FileMode.hs:22:1-24
                             (and originally defined in `Control.Monad.Catch')
2015-04-29 13:43:11 -04:00
Joey Hess
fab6c782a5 comment 2015-04-29 13:36:17 -04:00
Joey Hess
755da0e11e document --force 2015-04-29 13:32:50 -04:00
Joey Hess
cda2f83bad comment and improve man page 2015-04-29 13:25:10 -04:00
Joey Hess
ddcdf94162 rename to non-obnoxious name 2015-04-29 13:18:06 -04:00
Joey Hess
5ca0e7a6ef comment 2015-04-29 13:12:55 -04:00
Joey Hess
2fca1447b2 better document youtube playlists 2015-04-29 13:05:36 -04:00
Joey Hess
eab3fe8d9a close 2015-04-29 12:53:04 -04:00
Joey Hess
99dc681cda comment 2015-04-29 12:50:35 -04:00
Joey Hess
c205d58018 Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-29 12:44:13 -04:00
http://rfhbuk.pip.verisignlabs.com.pip.verisignlabs.com/
a08625a000 Added a comment: comment 2 2015-04-29 15:45:34 +00:00
Joey Hess
0791770f38 comment 2015-04-29 11:31:07 -04:00
thnetos
39dea48824 2015-04-29 15:30:02 +00:00
Joey Hess
b31010ac77 comment 2015-04-29 11:24:27 -04:00
Joey Hess
29155ce8a9 comment 2015-04-29 11:22:15 -04:00
Joey Hess
278c8dfba6 Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-29 11:16:16 -04:00
db48x
b5d91005f3 2015-04-29 05:48:05 +00:00
db48x
b9f552b347 2015-04-29 05:43:07 +00:00
anarcat
0fd405ced9 Added a comment: how does the queue get built now? 2015-04-28 21:32:36 +00:00
Joey Hess
d40dea58e3 merge generalization of writeFileProtected from propellor 2015-04-28 14:58:29 -04:00
db48x
a6b1c894ac 2015-04-28 18:15:41 +00:00
http://rfhbuk.pip.verisignlabs.com.pip.verisignlabs.com/
4289396948 2015-04-28 13:54:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkW9u-8uqR62QBZjeTNCXsL7Ds55dAMGbA
b143883e45 Added a comment 2015-04-28 10:15:24 +00:00
Joey Hess
986e245ac1 changelog 2015-04-27 18:10:56 -04:00
Joey Hess
a637e04fb6 Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-27 18:10:31 -04:00
Joey Hess
ee78958798 S3: Fix incompatability with bucket names used by hS3; the aws library cannot handle upper-case bucket names. git-annex now converts them to lower case automatically.
For example, it failed to get files from a bucket named S3.

Also fixes `git annex initremote UPPERCASE type=S3`, which failed with the
new aws library, with a signing error message.
2015-04-27 18:00:58 -04:00
Joey Hess
cfbeb1e7b7 Fix bogus failure of fsck --fast. 2015-04-27 17:40:21 -04:00
clacke
c2d91c2f46 Added a comment: not regression 2015-04-27 12:13:12 +00:00
silvio
989b7aef62 2015-04-26 13:45:35 +00:00
silvio
f7c45d5458 2015-04-26 12:40:16 +00:00
silvio
06025cb900 2015-04-26 12:39:16 +00:00
http://rfhbuk.pip.verisignlabs.com/
24a1ea420f Added a comment: git-annex: bad url ssh://git@gitlab.com:~/gitlabname/reponame.git 2015-04-26 12:19:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnVnsqEy82M-MuS2gLri-az83wSQ6lXSrc
b8ebdce288 Added a comment 2015-04-26 01:19:21 +00:00
tomekwi
5cbfbe0414 Added a comment: How about the other way round? 2015-04-25 09:13:31 +00:00
tomekwi
894ca69b83 removed 2015-04-25 09:13:13 +00:00