Commit graph

27604 commits

Author SHA1 Message Date
2a03:4980:13:4d00:21e:64ff:fe1c:1b1a
df3b6800c2 poll vote (Tahoe-LAFS) 2016-04-23 12:19:02 +00:00
2a03:4980:13:4d00:21e:64ff:fe1c:1b1a
11830277af poll vote (My phone (or MP3 player)) 2016-04-23 12:18:55 +00:00
jungle
a1598589e9 2016-04-23 09:42:59 +00:00
jungle
6e30f2a863 This reverts commit f7ced591d3 2016-04-23 09:41:16 +00:00
jungle
f7ced591d3 difference between uninit and unlock 2016-04-23 09:40:20 +00:00
anarcat
cfc6f5bdcf mention jessie backports, use apt, and clarify neurodebian 2016-04-23 04:11:27 +00:00
anarcat
7f1eb0e8ac clarify the fix 2016-04-23 04:08:55 +00:00
Joey Hess
89b3b40eeb
devblog 2016-04-22 16:10:26 -04:00
Joey Hess
154756ca76
response 2016-04-22 16:02:44 -04:00
Joey Hess
6ec154d70c
use --allow-unrelated-histories for now
I'd prefer to use the env var, but let's use what git currently supports.
Revert this when the env var gets supported.

Note that the version checking assumes git 2.8.2 will get support for the
switch.
2016-04-22 15:57:28 -04:00
Joey Hess
e4f159adb3
move 2016-04-22 15:12:09 -04:00
Joey Hess
f38d419781
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-22 15:11:38 -04:00
Joey Hess
4b187ef87b
comment 2016-04-22 15:11:00 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
07ca2bb416 2016-04-22 19:05:45 +00:00
http://id.clacke.se/
d0ee302e64 Added a comment 2016-04-22 19:01:46 +00:00
Joey Hess
0bba2627df
response; improve docs 2016-04-22 14:49:15 -04:00
Joey Hess
7945dd3c3e
refactor 2016-04-22 14:35:48 -04:00
Joey Hess
46e3319995
assistant: Deal with upcoming git's refusal to merge unrelated histories by default
git 2.8.1 (or perhaps 2.9.0) is going to prevent git merge from merging in
unrelated branches. Since the webapp's pairing etc features often combine
together repositories with unrelated histories, work around this behavior
change by setting GIT_MERGE_ALLOW_UNRELATED_HISTORIES when the assistant
merges.

Note though that this is not done for git annex sync's merges, so
it will follow git's default or configured behavior.
2016-04-22 14:26:44 -04:00
Joey Hess
8ab27235ea
reinject: Added new mode which can reinject known files into the annex.
For example: git-annex reinject --known /mnt/backup/*
2016-04-22 13:49:32 -04:00
Joey Hess
f9f2576203
Merge remote-tracking branch 'origin/master' 2016-04-22 12:30:36 -04:00
Joey Hess
0273cd5005
adjusted branches need git 2.2.0 or newer
When git-annex is used with a git version older than 2.2.0, disable support for
adjusted branches, since GIT_COMMON_DIR is needed to update them and was first
added in that version of git.
2016-04-22 12:29:32 -04:00
zarel
d98f6d20d9 Added a comment 2016-04-22 15:27:20 +00:00
zarel
a718cf2344 rename bugs/startup_scan_extremely_slow___40__v6_repo__41__.mdwn to bugs/startup_scan_extremely_slow.mdwn 2016-04-22 15:22:03 +00:00
interstar@551341a1dbca18391e90a3f719eae492868ceb7a
bc3614eba0 Added a comment 2016-04-22 12:38:16 +00:00
http://id.clacke.se/
f0d0e785e6 Added a comment: objecthashlower 2016-04-22 07:58:33 +00:00
http://id.clacke.se/
bf5ac8227b Added a comment: objecthashlower 2016-04-22 07:55:40 +00:00
http://id.clacke.se/
8c3a95b02c Added a comment: Case-sensitive on OSX 2016-04-22 07:53:56 +00:00
http://id.clacke.se/
164fb10308 Added a comment: git-annex is git 2016-04-22 07:44:07 +00:00
interstar@551341a1dbca18391e90a3f719eae492868ceb7a
8e27f35608 2016-04-22 03:14:03 +00:00
Joey Hess
a3465c6327
use more general module 2016-04-21 14:32:42 -04:00
Joey Hess
dab3b9c1b1
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-21 14:24:38 -04:00
Joey Hess
b4cb1093bb
todo 2016-04-21 14:24:06 -04:00
pigmonkey
080c3c9cc9 Added a comment 2016-04-21 16:57:03 +00:00
Joey Hess
eb4b556113
calckey can use --backend 2016-04-21 11:23:17 -04:00
cstork
c6c83ccb85 Added a comment 2016-04-21 14:35:46 +00:00
CandyAngel
53c7c246a6 Added a comment 2016-04-21 11:41:09 +00:00
j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077
0cf680bdaa Added a comment 2016-04-21 09:00:49 +00:00
cstork
fd5408e1cb Added a comment 2016-04-21 06:46:40 +00:00
Joey Hess
940f1b5cf0
devblog 2016-04-20 16:15:46 -04:00
Joey Hess
510d1bafa6
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-20 15:28:39 -04:00
Joey Hess
d13819b503
use a separate tmp dir for the test home 2016-04-20 15:27:59 -04:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
caba449869 Added a comment 2016-04-20 19:21:33 +00:00
Joey Hess
1de54ac671
a couple of tests chdir in ways that need an absolute path in the overridden HOME 2016-04-20 15:09:46 -04:00
Joey Hess
fcd09badca
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-20 15:05:02 -04:00
Joey Hess
c3fdaf764d
Isolate test suite from global git config settings. 2016-04-20 15:04:38 -04:00
spwhitton
2c969a94fb Added a comment 2016-04-20 19:01:21 +00:00
Joey Hess
b56218f0c2
Fix bug that prevented annex.sshcaching=false configuration from taking effect when on a crippled filesystem. Thanks, divergentdave. 2016-04-20 14:43:43 -04:00
Joey Hess
da4ff16805
comment 2016-04-20 14:36:46 -04:00
Joey Hess
f6c6963ed4
only filter out mdwn2man warning, not other warnings 2016-04-20 14:29:54 -04:00
Joey Hess
b143f630c2
comment 2016-04-20 14:27:24 -04:00