Commit graph

20558 commits

Author SHA1 Message Date
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
d5e40ef574 Added a comment: Here's a link to the image files 2016-05-03 06:14:40 +00:00
spwhitton
0558447ed4 Added a comment 2016-05-02 19:26:47 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
28af7c4b8a Added a comment 2016-05-02 18:43:33 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
02fea5bce5 Added a comment 2016-05-02 18:41:54 +00:00
Joey Hess
157993dd2f
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-02 10:53:38 -04:00
Joey Hess
617f2834fc
Fix bug that sometimes prevented git-annex smudge --clean from consuming all its input, which resulted in git add bypassing git-annex. 2016-05-02 10:53:24 -04:00
jfc@123850a543de181bdfae6868101bfb4e742a87ed
16bef50c6c 2016-05-02 14:53:07 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
67951cdd7c Added a comment 2016-05-01 21:47:18 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
cce2c126f9 2016-05-01 21:43:58 +00:00
zarel
a5862331ca 2016-05-01 19:33:03 +00:00
annexuser
1586e16a0b Added a comment 2016-04-30 17:30:18 +00:00
annexuser
1602210c9f 2016-04-30 17:23:33 +00:00
ollie@6d66b5a4b0992998efe3e4c244a66708bf5d96f3
c84d34063f Added a comment 2016-04-29 15:04:17 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
06f152f4c7 2016-04-29 13:25:24 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
5238da9f73 Added a comment 2016-04-29 13:21:04 +00:00
Gus
ad95032dd7 Added a comment: Branching questions 2016-04-29 12:11:35 +00:00
http://svario.it/gioele
24c224f4f9 Added a comment 2016-04-29 10:26:23 +00:00
CandyAngel
4482caf37d Added a comment 2016-04-29 10:04:55 +00:00
ollie@6d66b5a4b0992998efe3e4c244a66708bf5d96f3
754775a029 2016-04-29 09:50:07 +00:00
Joey Hess
d5ddfa44c4
devblog 2016-04-28 16:19:20 -04:00
Joey Hess
9c7e46c9c5
correction of scope of security problem
AFAICS, it's not only affecting resumes, but any upload to a special remote
with chunking enabled.
2016-04-28 16:07:10 -04:00
Joey Hess
9f6c29fb38
pin unix to already installed version
This prevents multiple versions of unix, from ghc and needed by newer
versions of some packages conflicting.

Had to update the bytestring and blaze-builder pins follow-on from this
change.
2016-04-28 14:21:57 -04:00
Joey Hess
1f253e84f2
add news item for git-annex 6.20160419 2016-04-28 09:48:45 -04:00
Joey Hess
58b65dd8ee
comment 2016-04-27 17:15:24 -04:00
Joey Hess
d0036b9100
todo 2016-04-27 17:15:02 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
85c17a0085 Added a comment 2016-04-27 17:42:24 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
6b5993fecc Added a comment 2016-04-27 17:41:01 +00:00
Joey Hess
0863102ee6
response 2016-04-27 13:35:33 -04:00
Joey Hess
405214780a
comment 2016-04-27 13:19:48 -04:00
Joey Hess
f31b1ba89b
comment 2016-04-27 13:11:50 -04:00
Joey Hess
32aeff9a8e
comment 2016-04-27 12:57:08 -04:00
Joey Hess
b890f3a53d
Fix bug that prevented resuming of uploads to encrypted special remotes that used chunking. This bug could also expose the names of keys to such remotes.
This is a low-severity security hole.
2016-04-27 12:54:43 -04:00
Joey Hess
363b984176
give this bug a sane title 2016-04-27 12:18:00 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
6b3fb2dd68 2016-04-27 15:56:18 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
6b2c1e6a7b 2016-04-27 15:26:59 +00:00
thowz
4443e639f3 Added a comment: create symlinks inside .git/annex/objects 2016-04-27 00:36:57 +00:00
sts
d6d9f54ff4 2016-04-26 19:43:20 +00:00
sts
4196cab3dc 2016-04-26 19:42:07 +00:00
sts
f4b67ad75e 2016-04-26 19:40:12 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
c674fbae4f initial report 2016-04-26 19:01:24 +00:00
xloem
e623d86acf Added a comment 2016-04-25 21:25:58 +00:00
xloem
0f8866a806 Added a comment: did this today 2016-04-25 20:40:03 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
4cece5a33e Added a comment 2016-04-25 18:28:14 +00:00
Joey Hess
7dc0b77783
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-25 13:47:46 -04:00
Joey Hess
cbb4433449
comment 2016-04-25 13:47:27 -04:00
Joey Hess
1ea2b23799
devblog 2016-04-25 13:43:41 -04:00
Joey Hess
4c573815f9
close todos covered by rclone 2016-04-25 13:43:24 -04:00
Joey Hess
e8a7fcc868
clarify tha DIRHASH returns mixed case
Maybe not the best thing that it does, but it can't really be changed w/o
breaking existing remotes.
2016-04-25 13:36:13 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
4e0316b22c initial whining 2016-04-25 17:27:25 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
ffe2ea2621 Added a comment 2016-04-25 17:21:26 +00:00
Abdo
a59e161796 2016-04-25 11:27:19 +00:00
ddenis
04dd68002d Fixed broken link to standard groups page 2016-04-24 16:19:20 +00:00
zarel
2404ececed Added a comment 2016-04-24 15:31:05 +00:00
CandyAngel
92bc62c22d Added a comment 2016-04-24 10:56:01 +00:00
branchable@d31204a44f76a567b0ac1ace14680d4f2ec7750d
e91a18f110 added rclone supported providers 2016-04-23 19:22:16 +00:00
branchable@d31204a44f76a567b0ac1ace14680d4f2ec7750d
26d64d7355 made link a link 2016-04-23 19:14:59 +00:00
branchable@d31204a44f76a567b0ac1ace14680d4f2ec7750d
6cdd633936 mentioned git-annex-remote-rclone 2016-04-23 19:13:49 +00:00
divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899
682ce568e4 Added a comment: Further information 2016-04-23 18:31:23 +00:00
annexuser
55b842f1f1 2016-04-23 17:48:31 +00:00
cstork
530d774cd8 Added a comment 2016-04-23 16:43:11 +00:00
fiatjaf
2561fcf699 Added a comment 2016-04-23 15:01:24 +00:00
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
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
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
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
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
caba449869 Added a comment 2016-04-20 19:21:33 +00: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
b143f630c2
comment 2016-04-20 14:27:24 -04:00
Joey Hess
7dfce1f41e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-20 14:25:09 -04:00
Joey Hess
70016c8dc2
comment 2016-04-20 14:24:26 -04:00
pigmonkey
b245e7b7a1 Added a comment 2016-04-20 18:20:43 +00:00
Joey Hess
5664fce5dd
comment 2016-04-20 14:13:52 -04:00
Joey Hess
052b440e7c
this bug report/rant section has gotten way past diminishing returns, so I am deleting it
Sorry, but I have no interest in arguing about false equivilances such as
comment 23.
2016-04-20 14:00:39 -04:00
Joey Hess
a6dfea161f
paren 2016-04-20 13:55:15 -04:00
Joey Hess
0d41657f5c
fixed via time machine 2016-04-20 13:52:49 -04:00
Joey Hess
1bfea9b3e5
calckey: New plumbing command, calculates the key that would be used to refer to a file 2016-04-20 13:50:26 -04:00
Joey Hess
9d952fe9d1
reinject: When src file's content cannot be verified, leave it alone, instead of deleting it. 2016-04-20 13:21:56 -04:00
Joey Hess
bb92b45fb7
comment 2016-04-20 12:57:22 -04:00
Joey Hess
4c7e835d39
response 2016-04-20 12:55:03 -04:00
Joey Hess
2ee46024c0
followup 2016-04-20 12:51:31 -04:00
Joey Hess
744c236b78
comment 2016-04-20 12:45:58 -04:00
Joey Hess
aa68f2ea7e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-20 12:40:33 -04:00
Joey Hess
f947781fa0
Avoid setting LOCPATH in linux standalone builds now that ghc has been fixed to not hang when it cannot find locale files. 2016-04-20 12:40:11 -04:00
pigmonkey
533370576e 2016-04-20 16:32:36 +00:00
Joey Hess
b949e85045
remove old closed bugs and todo items to speed up wiki updates and reduce size
Remove closed bugs and todos that were last edited or commented before Q3 2015.

Command line used:

for f in $(grep -l '\[\[done\]\]' -- *.mdwn); do d="$(echo "$f" | sed 's/.mdwn$//')"; if [ -z "$(git log --since=09-09-2015 --pretty=oneline -- "$f")" -a -z "$(git log --since=09-09-2015 --pretty=oneline -- "$d")" ]; then git rm -- "$f"; git rm -rf "$d"; fi; done
for f in $(grep -l '|done\]\]' -- *.mdwn); do d="$(echo "$f" | sed 's/.mdwn$//')"; if [ -z "$(git log --since=09-09-2015 --pretty=oneline -- "$f")" -a -z "$(git log --since=09-09-2015 --pretty=oneline -- "$d")" ]; then git rm -- "$f"; git rm -rf "$d"; fi; done
2016-04-19 13:55:29 -04:00
Joey Hess
a9c7260adb
reopen, comment 2016-04-19 13:27:56 -04:00
Joey Hess
850d0da699
Fix duplicate progress meter display when downloading from a git remote over http with -J. 2016-04-19 13:10:56 -04:00
Joey Hess
e3fb94b006
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-19 12:51:36 -04:00
Joey Hess
60ae80a13a
reproduced 2016-04-19 12:51:20 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
f1f437aada Added a comment 2016-04-19 16:24:50 +00:00
Joey Hess
db8ec3a16a
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-19 11:46:24 -04:00
Joey Hess
89d6e5d2f7
comment 2016-04-19 11:33:55 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
0cec13ddf7 added meta that author was mih 2016-04-19 14:49:11 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
55474db92f Added a comment 2016-04-19 14:47:58 +00:00
Joey Hess
eff8673a35
add news item for git-annex 6.20160418 2016-04-18 18:48:36 -04:00
Joey Hess
cd4902068a
releasing package git-annex version 6.20160418 2016-04-18 18:47:55 -04:00
Joey Hess
b83fe02edd
fix link 2016-04-18 16:36:16 -04:00
https://tylercipriani.com/
48de59b580 poll vote (Tahoe-LAFS) 2016-04-18 17:49:35 +00:00
8.44.144.24
75114b0184 poll vote (OpenStack SWIFT) 2016-04-18 17:47:48 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
11de7fac90 Added a comment 2016-04-18 14:16:31 +00:00
Horus
ef61123c4f Added a comment 2016-04-17 14:10:37 +00:00
Horus
b33b998cec Added a comment 2016-04-17 14:10:15 +00:00
http://svario.it/gioele
f24dba7616 Added a comment 2016-04-16 12:53:13 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
8140aa58ea removed 2016-04-16 11:53:24 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
6403964cb6 Added a comment: Assistant support 2016-04-16 11:52:34 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
ab2ba2f37f Added a comment: Assistant support 2016-04-16 11:52:14 +00:00
divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899
42f385d537 Added a comment 2016-04-15 12:24:07 +00:00
xloem
d4b3a8a18e 2016-04-15 02:18:43 +00:00
Joey Hess
5d4c235474
response 2016-04-14 17:39:48 -04:00
Joey Hess
6a07ed22cb
comment 2016-04-14 16:08:35 -04:00
Joey Hess
b0876bd6a8
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-14 15:55:54 -04:00
Joey Hess
a9fbd736e2
devblog 2016-04-14 15:55:42 -04:00
Joey Hess
25f7510d29
comment 2016-04-14 15:52:46 -04:00
Joey Hess
3474f48067
comment 2016-04-14 15:43:26 -04:00
Joey Hess
3c2e841d31
comment 2016-04-14 15:42:00 -04:00
Joey Hess
bd516af734
fsck: Warn when core.sharedRepository is set and an annex object file's write bit is not set and cannot be set due to the file being owned by a different user.
Made all Annex.Perms file mode changing functions ignore errors when
core.sharedRepository is set, because the file might be owned by someone
else. I don't fancy getting bug reports about crashes due to set modes in
this configuration, which is a very foot-shooty configuration in the first
place.

The fsck warning is necessary because old repos kept files mode 444, which
doesn't allow locking them, and so if the mode remains 444 due to the file
being owned by someone else, the user should be told about it.
2016-04-14 15:36:53 -04:00
Don
db1e7965ea Added a comment 2016-04-14 19:31:52 +00:00
Joey Hess
5cb7f590be
close probably bogus bug and followup 2016-04-14 15:04:50 -04:00
Joey Hess
3a52b3215a
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-14 14:56:54 -04:00
Joey Hess
d05a75e45a
fix bug in unlocked file scanner that skipped over executable unlocked files 2016-04-14 13:07:46 -04:00
http://id.clacke.se/
18ce4d573c Added a comment: git-config for manual sync-like operations 2016-04-14 08:21:03 +00:00
Joey Hess
481eb1de03
devblog 2016-04-13 16:40:57 -04:00
Joey Hess
975ec15a86
response 2016-04-13 15:26:18 -04:00
Joey Hess
e462f9a34e
response 2016-04-13 15:23:11 -04:00
Joey Hess
54942c818b
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-13 15:11:51 -04:00
tim@5431dd39464df207b7d46d3cf1bc74c82123ac68
ea803d1554 Added a comment: Sharing S3 bucket without fileprefix 2016-04-13 19:02:24 +00:00
Joey Hess
ed68f0c0a0
webapp: Update url to add gitlab.com ssh key. (Psst GitLab.. cool urls don't change!) 2016-04-13 14:49:01 -04:00
Joey Hess
d1da01c2cf
dup? 2016-04-13 14:32:07 -04:00
Joey Hess
944925a646
comment 2016-04-13 14:20:54 -04:00
Joey Hess
7c60f546ef
pointer 2016-04-13 14:16:34 -04:00
Joey Hess
4b5e3b91f3
response 2016-04-13 14:13:01 -04:00
Joey Hess
1010482bc7
webapp: When $HOME is a git repository, and has been initialized for use by git-annex, opening the webapp went ahead and ran the assistant there, annexing all files. Since this is almost certianly not desirable, especially when the user is just opening the webapp from a dekstop menu which happens to run it in $HOME, the webapp will now not treat such a $HOME git repository as a git-annex repository. 2016-04-13 14:07:50 -04:00
Joey Hess
fe1628db11
comment 2016-04-13 14:06:01 -04:00
Joey Hess
fb4949dc1c
response 2016-04-13 13:42:31 -04:00
Joey Hess
b19511822a
update 2016-04-13 13:39:16 -04:00
Joey Hess
402e5adab8
smudge: Print a warning when annex.thin is set, as git's smudge interface does not allow honoring that configuration. 2016-04-13 13:34:24 -04:00
Joey Hess
4e925cb604
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-13 13:01:02 -04:00
Joey Hess
b731ff689c
followup 2016-04-13 12:59:59 -04:00
Joey Hess
addda95c2a
point to git-annx fix from annex.thin docs 2016-04-13 12:49:52 -04:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
a314e77f83 removed 2016-04-13 16:00:50 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
9b6022f5ac Added a comment 2016-04-13 15:58:30 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
d5664aa1f4 removed 2016-04-13 14:36:27 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
accb539ac0 Added a comment 2016-04-13 14:35:39 +00:00
j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077
b6174e7621 Added a comment 2016-04-13 10:15:03 +00:00
Jan
a525b75320 Added a comment 2016-04-13 09:05:24 +00:00
Joey Hess
dcf8d3b73f
add news item for git-annex 6.20160412 2016-04-12 16:40:26 -04:00
Joey Hess
08625c5a89
comment 2016-04-12 15:29:01 -04:00
Joey Hess
bbe994295f
Fix build with ghc v7.11. Thanks, Gabor Greif. 2016-04-12 15:27:51 -04:00
Joey Hess
e76cd0ec69
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-12 15:24:50 -04:00
Joey Hess
7815f227d2
update 2016-04-12 14:31:37 -04:00
Joey Hess
fdb6839cf7
update 2016-04-12 14:28:38 -04:00
Joey Hess
630fe90bf3
update 2016-04-12 14:24:48 -04:00
Joey Hess
eac26f13db
Fix bug in annex.largefiles mimetype= matching when git-annex is run in a subdirectory of the repository. 2016-04-12 14:19:34 -04:00
Joey Hess
c672481352
response 2016-04-12 13:40:32 -04:00
Joey Hess
8dbc009b1b
response 2016-04-12 13:16:47 -04:00
Jan
88afa9eb4e Added a comment: git-annex on a PowerPC based synology? 2016-04-12 15:41:24 +00:00
Joey Hess
7d0a078e5c
todo 2016-04-11 11:40:19 -04:00
Joey Hess
113d948cd1
remove incorrect out of dateness warning 2016-04-11 11:26:44 -04:00
hugues.fontenelle@a0dfbe32c0e6575ef1eb2a2f13cd79ee8761de34
2375aec6c4 2016-04-11 10:53:16 +00:00
xloem
359ab36a6b 2016-04-11 01:43:50 +00:00
Antoine Beaupré
c043bd9faf another thing i forgot 2016-04-10 19:20:37 -04:00
Antoine Beaupré
751abdd51f fix for manpage generation without hacks 2016-04-10 19:13:01 -04:00
xloem
20ea3a9f9f 2016-04-10 22:42:11 +00:00
annexuser
642a7b50d4 2016-04-10 20:29:16 +00:00
j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077
56098f2ad5 Added a comment 2016-04-10 13:47:30 +00:00
j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077
9090987780 2016-04-10 13:07:32 +00:00
Joey Hess
17acfe8032
devblog 2016-04-09 14:20:34 -04:00
Joey Hess
8623f23aac
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-09 14:18:17 -04:00
Joey Hess
7d28110c68
fix master push overwrite race when updating adjusted branch, by maintaining basis ref 2016-04-09 14:12:25 -04:00
Joey Hess
f0ddc0a75c
comment 2016-04-09 13:22:27 -04:00
spwhitton
bcc5e0bafc file bug 2016-04-09 17:16:07 +00:00
Joey Hess
b3b1d72d57
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-09 12:31:27 -04:00
Antoine Beaupré
a5158baa89 possible fix for markdown generation with pandoc 2016-04-09 11:04:42 -04:00
Antoine Beaupré
c363bea652 attack the manpage problem 2016-04-09 10:40:53 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
d89161e13f Added a comment: freenet special remote 2016-04-09 10:37:23 +00:00
Antoine Beaupré
d1dd9b5a4b respond 2016-04-09 00:41:41 -04:00
ExGen
196547ec8d Added a comment: comment 4 2016-04-08 22:00:33 +00:00
Joey Hess
c2ce3dfed3
windows does not like filenames starting with a dot, rename 2016-04-08 17:08:07 -04:00
ExGen
f970490750 Added a comment: comment 3^^ 2016-04-08 21:03:15 +00:00
Joey Hess
c4be17d159
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-08 15:35:55 -04:00
Joey Hess
973d66bb67
update 2016-04-08 15:31:53 -04:00
Joey Hess
cf06dac2b8
hard links on windows
* annex.thin and annex.hardlink are now supported on Windows.
* unannex --fast now makes hard links on Windows.
2016-04-08 15:25:32 -04:00
Joey Hess
251405eca2
avoid withWorkTreeRelated affecting annex symlink calculation 2016-04-08 14:24:00 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
c0008c0c53 2016-04-08 16:35:37 +00:00
ggreif@8132a868199b4ffec14150c87f538dc06a538220
441dfba4c3 pull request for Bup.hs 2016-04-08 16:17:53 +00:00
Joey Hess
f41045bf19
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-06 19:32:01 -04:00
Joey Hess
555e235e1c
devbog 2016-04-06 19:26:25 -04:00
Joey Hess
64de6dcc74
one little bug.. 2016-04-06 19:23:32 -04:00
Joey Hess
60bdffe43e
fix auto merge conflict resolution when doing out of tree merge for adjusted branch 2016-04-06 17:32:04 -04:00
Joey Hess
b9e4e2ba84
new method for merging changes into adjusted branch that avoids unncessary merge conflicts
Still needs work when there are actual merge conflicts.
2016-04-06 15:36:18 -04:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
c0ad345e45 2016-04-06 19:29:51 +00:00
Gus
03e679ce12 2016-04-06 16:05:42 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
3606b2746d Added a comment 2016-04-06 10:14:30 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
1c1a7bdaa4 Added a comment 2016-04-05 22:29:06 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
8f3c50cb27 Added a comment 2016-04-05 21:28:20 +00:00
Joey Hess
b9c16568ef
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-05 14:30:13 -04:00
Joey Hess
68ef108cb7
another reason 2016-04-05 14:29:33 -04:00
zarel
0fed223e4d Added a comment 2016-04-05 17:24:06 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
9d1c79d48d 2016-04-05 12:49:52 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
70b2621c01 2016-04-05 12:44:18 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
886f5b2d12 Added a comment 2016-04-05 09:19:59 +00:00
szrc
08897ff3a2 Added a comment 2016-04-05 01:18:53 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
ec0fcc8756 Added a comment 2016-04-04 21:21:56 +00:00
Joey Hess
9faf5c8837
devblog 2016-04-04 17:01:46 -04:00
Joey Hess
ea4ca877ce
comment 2016-04-04 17:01:08 -04:00
Joey Hess
398458b0d4
wording 2016-04-04 16:57:13 -04:00
Joey Hess
4c1f46262c
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-04 16:52:47 -04:00
Joey Hess
db98ee6dc1
comment 2016-04-04 16:51:34 -04:00
Antoine Beaupré
d5e0469f68 comment 2016-04-04 16:51:14 -04:00
Antoine Beaupré
7a56f9e9e3 simplify manpage example and ask another question
sorry for the noise again...
2016-04-04 16:33:08 -04:00
Joey Hess
374e15663c
response 2016-04-04 16:32:38 -04:00
Joey Hess
20d15f70dd
response 2016-04-04 16:21:30 -04:00
Joey Hess
a3b7032936
comment 2016-04-04 16:16:38 -04:00
Joey Hess
6e576a5336
comment 2016-04-04 16:13:47 -04:00
Joey Hess
4a9b021543
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-04 16:10:39 -04:00
Joey Hess
5d1ad2b4b2
comment and improve docs 2016-04-04 16:10:05 -04:00
anarcat
7729ca4b14 Added a comment: clarified manpage 2016-04-04 20:00:40 +00:00
Joey Hess
d85d8b08d1
comment 2016-04-04 15:59:20 -04:00
anarcat
50ec2410f8 add examples on how to manually setup the remote keys setup by the assistant 2016-04-04 19:58:43 +00:00
Joey Hess
8e9820d491
comment 2016-04-04 15:55:50 -04:00
anarcat
7c5f43affb ugh. so it works with ~/.ssh/git-annex 2016-04-04 19:51:50 +00:00
Joey Hess
eeb74958a3
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-04 15:44:16 -04:00
Joey Hess
2046502407
v6: Close pointer file handles more quickly, to avoid problems on Windows.
Was using L.readFile, so the Handle would remain open until the garbage
collector got around to it. Changed to explicit open and close, so we know
it's always closed when the function returns.
2016-04-04 15:42:33 -04:00
Joey Hess
cfe274e6f7
comment 2016-04-04 15:22:43 -04:00
Joey Hess
52b838d17e
comment 2016-04-04 15:14:58 -04:00
Joey Hess
cc16de7a5b
comment 2016-04-04 15:02:39 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
953d3accdc Clarified CHECKURL-MULTI syntax 2016-04-04 19:00:04 +00:00
Joey Hess
775bf431c8
comment 2016-04-04 14:58:34 -04:00
Joey Hess
6416411ba1
comment 2016-04-04 14:52:43 -04:00
Joey Hess
f78cbd9f0d
todo 2016-04-04 14:38:29 -04:00
Joey Hess
1720f9f851
still bug with sync in adjusted branch 2016-04-04 13:55:15 -04:00
Joey Hess
7c7f3a0f76
deal with cloning a repo that has an ajdusted branch checked out 2016-04-04 13:51:42 -04:00
Joey Hess
83ac453bc4
update 2016-04-04 13:26:33 -04:00
Joey Hess
17d71ded79
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-04 13:17:46 -04:00
Joey Hess
c3e0859846
Upgrading a direct mode repository to v6 has changed to enter an adjusted unlocked branch.
This makes the direct mode to v6 upgrade able to be performed in one clone
of a repository without affecting other clones, which can continue using v5
and direct mode.
2016-04-04 13:17:24 -04:00
anarcat
dfd7a491f1 2016-04-04 14:41:14 +00:00
ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626
9162c06055 Added a comment 2016-04-04 11:25:34 +00:00
ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626
df295afb72 Added a comment 2016-04-04 11:24:39 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
95b9bc033b 2016-04-04 06:24:32 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
572d2780eb Added a comment 2016-04-04 06:07:20 +00:00
szrc
f1b7f407ee Added a comment: Local storage of creds 2016-04-04 03:59:02 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
48a786902c Added a comment 2016-04-03 23:00:48 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
c271a7ad26 Added a comment 2016-04-03 22:30:59 +00:00
ExGen
ace65c6ea2 removed 2016-04-03 20:16:50 +00:00
ExGen
4411894024 removed 2016-04-03 20:16:30 +00:00
ExGen
8cc33aaf0f Added a comment: Found? 2016-04-03 20:15:02 +00:00
ExGen
62e21f63cd Added a comment: O_O 2016-04-03 19:56:01 +00:00
ExGen
a13110a6af Added a comment: O_o 2016-04-03 14:42:29 +00:00
ExGen
34f2c07d01 rename bugs/Get_failed.mdwn to bugs/Windows__58___git_annex_get_failed.mdwn 2016-04-03 14:01:06 +00:00
ExGen
4f610fad39 2016-04-03 14:00:09 +00:00
ExGen
87e4e2e4c2 Added a comment: Same 2016-04-03 13:47:26 +00:00
ExGen
6b2425d7bf Added a comment: Harlinks 2016-04-03 11:21:02 +00:00
gavinwahl@d3a94ffbd6df3b8833a53ff11ec435f58f7c44a9
9c41ad3dbc Added a comment: Shared key - how many keys? 2016-04-03 03:43:58 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
899cb2ddfc 2016-04-03 00:43:14 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
d03f445e77 Added a comment: Makes sense. 2016-04-02 23:41:23 +00:00
ExGen
730e1aee68 Added a comment: Harlinks 2016-04-02 23:32:24 +00:00
Joey Hess
c7b06b879b
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-02 16:48:03 -04:00
zarel
0522afa067 Added a comment 2016-04-02 20:22:23 +00:00
zarel
2f420e3ca9 2016-04-02 20:16:47 +00:00
tim@5431dd39464df207b7d46d3cf1bc74c82123ac68
083dd8f64e Typo 2016-04-01 21:38:42 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
6509834f3d Added a comment: cache? 2016-04-01 19:56:44 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
ce63557e23 2016-04-01 17:05:04 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
e793a32082 2016-04-01 17:04:21 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
d1621c89cc 2016-04-01 17:02:44 +00:00
Joey Hess
3125b4298b
better example 2016-04-01 10:58:21 -04:00