Joey Hess [Mon, 2 Nov 2015 15:19:48 +0000 (11:19 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 2 Nov 2015 15:18:44 +0000 (11:18 -0400)]
document default --autostart --startdelay=5 and comment
Joey Hess [Mon, 2 Nov 2015 15:14:03 +0000 (11:14 -0400)]
Fix failure to build with aws-0.13.0 and finish nearline support.
* Fix failure to build with aws-0.13.0.
* When built with aws-0.13.0, the S3 special remote can be used to create
google nearline buckets, by setting storageclass=NEARLINE.
edward [Mon, 2 Nov 2015 10:10:10 +0000 (10:10 +0000)]
fix typo: quite -> quiet
skrug@99b63a3f040bc693f0f81a9080e1a4a47ee81312 [Sun, 1 Nov 2015 16:56:31 +0000 (16:56 +0000)]
skrug@99b63a3f040bc693f0f81a9080e1a4a47ee81312 [Sun, 1 Nov 2015 16:50:39 +0000 (16:50 +0000)]
Joey Hess [Sat, 31 Oct 2015 01:47:09 +0000 (21:47 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Sat, 31 Oct 2015 01:46:35 +0000 (21:46 -0400)]
devblog
Added a comment: FWIW
https://id.koumbit.net/anarcat [Fri, 30 Oct 2015 15:42:35 +0000 (15:42 +0000)]
add three more alternatives...
https://id.koumbit.net/anarcat [Fri, 30 Oct 2015 15:37:09 +0000 (15:37 +0000)]
Added a comment: re tox
http://keverets.livejournal.com/ [Fri, 30 Oct 2015 10:54:39 +0000 (10:54 +0000)]
Gastlag [Fri, 30 Oct 2015 10:42:06 +0000 (10:42 +0000)]
Added a comment: Is xmpp the problem ?
Joey Hess [Thu, 29 Oct 2015 15:06:29 +0000 (11:06 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
parhuzamos [Wed, 28 Oct 2015 21:25:44 +0000 (21:25 +0000)]
http://www.joachim-breitner.de/ [Wed, 28 Oct 2015 21:22:57 +0000 (21:22 +0000)]
parhuzamos [Wed, 28 Oct 2015 21:01:29 +0000 (21:01 +0000)]
User "bence" was using Google OpenID which is not supported anymore. Found this moved page, edited it to get notified if anything happens.
parhuzamos [Wed, 28 Oct 2015 20:58:36 +0000 (20:58 +0000)]
ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626 [Wed, 28 Oct 2015 13:10:28 +0000 (13:10 +0000)]
Jonan [Wed, 28 Oct 2015 11:10:44 +0000 (11:10 +0000)]
Jonan [Wed, 28 Oct 2015 11:06:30 +0000 (11:06 +0000)]
Joey Hess [Wed, 28 Oct 2015 04:18:01 +0000 (00:18 -0400)]
merge from propellor
jonas@1491caea7d71fcf350b6f200807141f1b59857b8 [Tue, 27 Oct 2015 10:14:17 +0000 (10:14 +0000)]
Added a comment: gcrypt and map
Joey Hess [Mon, 26 Oct 2015 19:35:55 +0000 (15:35 -0400)]
Catch up with current git behavior when both repo and repo.git exist; it seems it now prefers repo in this case, although historically it may have preferred repo.git.
Joey Hess [Mon, 26 Oct 2015 19:33:32 +0000 (15:33 -0400)]
comment
Joey Hess [Mon, 26 Oct 2015 18:55:40 +0000 (14:55 -0400)]
enableremote: List uuids and descriptions of remotes that can be enabled, and accept either the uuid or the description in leu if the name.
Joey Hess [Mon, 26 Oct 2015 17:35:59 +0000 (13:35 -0400)]
response
Joey Hess [Mon, 26 Oct 2015 17:33:38 +0000 (13:33 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 26 Oct 2015 17:33:21 +0000 (13:33 -0400)]
respinse
Joey Hess [Mon, 26 Oct 2015 17:29:12 +0000 (13:29 -0400)]
emphasize that 32 bit version if git for windows is the one that works with git-annex
craig@6ddb6e2c94325e18a0d631a06e63fdc111ab1f12 [Sun, 25 Oct 2015 19:00:57 +0000 (19:00 +0000)]
Added a comment: Replicating my key for encrypted special remotes
124.40.246.76 [Sat, 24 Oct 2015 18:32:21 +0000 (18:32 +0000)]
poll vote (/sdcard/annex)
db48x [Wed, 21 Oct 2015 20:11:32 +0000 (20:11 +0000)]
Added a comment: oops
Joey Hess [Wed, 21 Oct 2015 14:11:49 +0000 (10:11 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Henrik Ahlgren [Wed, 21 Oct 2015 06:48:11 +0000 (09:48 +0300)]
Changelog typo: remove, not remote
CandyAngel [Wed, 21 Oct 2015 09:59:06 +0000 (09:59 +0000)]
Added a comment
OlivierBerger [Wed, 21 Oct 2015 08:29:05 +0000 (08:29 +0000)]
Joey Hess [Wed, 21 Oct 2015 06:22:18 +0000 (02:22 -0400)]
Symlink timestamp preservation code uses functions from unix-2.7.0 when available, which should be more portable.
anarcat [Tue, 20 Oct 2015 04:44:39 +0000 (04:44 +0000)]
trick question
Joey Hess [Tue, 20 Oct 2015 04:43:53 +0000 (00:43 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 20 Oct 2015 04:43:18 +0000 (00:43 -0400)]
update
db48x [Mon, 19 Oct 2015 21:47:03 +0000 (21:47 +0000)]
Joey Hess [Mon, 19 Oct 2015 21:09:17 +0000 (17:09 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 19 Oct 2015 21:09:06 +0000 (17:09 -0400)]
Use statvfs on OSX.
Fixes a recent-ish build warning on about 64 bit vs non.
This is the method used by the disk-free-space library, and I tested it to
yield the same results on even 10 tb drives on OSX -- so it's getting 64
bit values.
anarcat [Mon, 19 Oct 2015 20:58:57 +0000 (20:58 +0000)]
Added a comment: happy birthday!
Joey Hess [Mon, 19 Oct 2015 20:04:20 +0000 (16:04 -0400)]
add link to new survey
Joey Hess [Mon, 19 Oct 2015 19:59:11 +0000 (15:59 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
http://joeyh.name/ [Mon, 19 Oct 2015 19:58:36 +0000 (19:58 +0000)]
Added a comment
Joey Hess [Mon, 19 Oct 2015 19:57:26 +0000 (15:57 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 19 Oct 2015 19:57:15 +0000 (15:57 -0400)]
devblog
anarcat [Mon, 19 Oct 2015 19:44:32 +0000 (19:44 +0000)]
Added a comment
Joey Hess [Mon, 19 Oct 2015 19:15:04 +0000 (15:15 -0400)]
2015 user survey
Joey Hess [Mon, 19 Oct 2015 18:54:42 +0000 (14:54 -0400)]
add news item for git-annex 5.
20151019
Joey Hess [Mon, 19 Oct 2015 18:41:29 +0000 (14:41 -0400)]
roadmap update
Joey Hess [Mon, 19 Oct 2015 18:23:48 +0000 (14:23 -0400)]
Debian: Remote menu file, since a desktop file is provided and lintian says there can be only one.
Joey Hess [Mon, 19 Oct 2015 17:59:24 +0000 (13:59 -0400)]
prep release
Joey Hess [Mon, 19 Oct 2015 17:54:10 +0000 (13:54 -0400)]
remove verbose flag; aws deps fixed
Joey Hess [Mon, 19 Oct 2015 17:51:52 +0000 (13:51 -0400)]
response
Joey Hess [Mon, 19 Oct 2015 17:39:48 +0000 (13:39 -0400)]
comment
Joey Hess [Mon, 19 Oct 2015 17:36:24 +0000 (13:36 -0400)]
response
ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626 [Mon, 19 Oct 2015 07:09:53 +0000 (07:09 +0000)]
Added a comment
darkfeline [Sun, 18 Oct 2015 23:58:08 +0000 (23:58 +0000)]
Added a comment
ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626 [Sun, 18 Oct 2015 20:45:04 +0000 (20:45 +0000)]
darkfeline [Sun, 18 Oct 2015 20:15:56 +0000 (20:15 +0000)]
Added a comment
craig@6ddb6e2c94325e18a0d631a06e63fdc111ab1f12 [Sat, 17 Oct 2015 16:29:24 +0000 (16:29 +0000)]
Added a comment: Replicating my key for encrypted special remotes
ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626 [Sat, 17 Oct 2015 14:54:13 +0000 (14:54 +0000)]
Added a comment
anarcat [Sat, 17 Oct 2015 02:17:13 +0000 (02:17 +0000)]
Added a comment: amazing
PaulK [Fri, 16 Oct 2015 01:32:38 +0000 (01:32 +0000)]
Added a comment
Joey Hess [Thu, 15 Oct 2015 20:50:10 +0000 (16:50 -0400)]
devblog
Joey Hess [Thu, 15 Oct 2015 20:42:54 +0000 (16:42 -0400)]
upstream patch needs testing
Joey Hess [Thu, 15 Oct 2015 20:03:57 +0000 (16:03 -0400)]
followup
Joey Hess [Thu, 15 Oct 2015 19:44:11 +0000 (15:44 -0400)]
close as encfs is the bug
Joey Hess [Thu, 15 Oct 2015 19:41:26 +0000 (15:41 -0400)]
fixed
Joey Hess [Thu, 15 Oct 2015 19:28:29 +0000 (15:28 -0400)]
Avoid displaying network transport warning when a ssh remote does not yet have an annex.uuid set.
Instead, only display transport error if the configlist output doesn't
include an annex.uuid line, even an empty one.
A recent change made git-annex init try to get all the remote uuids, and so
the transport error would be displayed by it. It was also displayed when
eg, copying files to a remote that had no uuid yet.
Joey Hess [Thu, 15 Oct 2015 19:23:48 +0000 (15:23 -0400)]
add a hint about syncing when unable to determine remote uuid
syncing gets the uuid in passing..
Joey Hess [Thu, 15 Oct 2015 19:10:14 +0000 (15:10 -0400)]
improve layout and comment
Joey Hess [Thu, 15 Oct 2015 18:51:08 +0000 (14:51 -0400)]
response
Joey Hess [Thu, 15 Oct 2015 18:45:48 +0000 (14:45 -0400)]
response
Joey Hess [Thu, 15 Oct 2015 18:27:14 +0000 (14:27 -0400)]
do tmp dir cleanup in error case too
Joey Hess [Thu, 15 Oct 2015 18:27:03 +0000 (14:27 -0400)]
close
Joey Hess [Thu, 15 Oct 2015 18:22:46 +0000 (14:22 -0400)]
avoid making post-merge-conflict-resolution commit when no conflicts were resolved
sync, merge, assistant: When git merge failed for a reason other than a
conflicted merge, such as a crippled filesystem not allowing particular
characters in filenames, git-annex would make a merge commit that could
omit such files or otherwise be bad. Fixed by aborting the whole merge
process when git merge fails for any reason other than a merge conflict.
Joey Hess [Thu, 15 Oct 2015 18:13:39 +0000 (14:13 -0400)]
analysis
Joey Hess [Thu, 15 Oct 2015 17:14:57 +0000 (13:14 -0400)]
comment
Joey Hess [Thu, 15 Oct 2015 15:42:55 +0000 (11:42 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 15 Oct 2015 14:37:06 +0000 (10:37 -0400)]
S3: Fix support for using https.
Was using the http-only Manager before, not the tls-capable one.
Joey Hess [Thu, 15 Oct 2015 14:34:19 +0000 (10:34 -0400)]
refactor
CandyAngel [Thu, 15 Oct 2015 10:59:59 +0000 (10:59 +0000)]
Added a comment
ptspts@d0db5f2b8c4e6befae8899f31c117d093913f43e [Thu, 15 Oct 2015 08:54:08 +0000 (08:54 +0000)]
Added a comment: renaming oesn't work as expected when changing the extension
PaulK [Thu, 15 Oct 2015 04:34:35 +0000 (04:34 +0000)]
PaulK [Thu, 15 Oct 2015 04:31:51 +0000 (04:31 +0000)]
PaulK [Thu, 15 Oct 2015 04:28:39 +0000 (04:28 +0000)]
Joey Hess [Wed, 14 Oct 2015 17:44:20 +0000 (13:44 -0400)]
word wrap
projects / git-annex.git / log