Commit graph

20286 commits

Author SHA1 Message Date
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
Joey Hess
11d76f0c8e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-31 19:07:03 -04:00
Joey Hess
92db17e16f
devblog 2016-03-31 19:06:30 -04:00
Joey Hess
ed3e8e1886
Merge branch 'adjustedbranch' 2016-03-31 19:05:47 -04:00
Joey Hess
b7d7cc858e
remove old bug
I just fixed this one today; it was not the problem I thought it was.
2016-03-31 18:56:30 -04:00
Joey Hess
12ddb6e8b2
fixed merging of changes from adjusted branch + a remote 2016-03-31 18:54:35 -04:00
Kalle
78ce8fc01c Added a comment: Had what I believe to be the same issue 2016-03-31 21:22:22 +00:00
Joey Hess
860602a1e6
made some progress on syncing adjusted branches, but still buggy 2016-03-31 14:56:10 -04:00
Don
2f239a3705 Added a comment: want everything, but not old versions 2016-03-31 18:50:56 +00:00
Antoine Beaupré
c82d6ba99e explain a bit more 2016-03-31 10:55:20 -04:00
Antoine Beaupré
2819bab344 new script 2016-03-31 10:50:37 -04:00
anarcat
02cdd59bb6 another batch? 2016-03-31 14:08:03 +00:00
Joey Hess
93f5ccc808
update 2016-03-30 16:01:59 -04:00
Joey Hess
20c942108c
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-30 15:55:23 -04:00
Joey Hess
d72b85d437
update 2016-03-30 15:55:18 -04:00
anarcat
749e1041b3 workaround 2016-03-30 18:19:17 +00:00
anarcat
625d4bb8f1 more details 2016-03-30 18:11:30 +00:00
anarcat
7935355b7e weird info bug 2016-03-30 18:02:25 +00:00
anarcat
e250bd801b formatting fix 2016-03-30 03:22:00 +00:00
anarcat
9b7ea9aaf6 usability issue with crippled filesystems? not sure how to handle this 2016-03-30 03:21:00 +00:00
Joey Hess
f63b839763
todo 2016-03-29 18:03:02 -04:00
Joey Hess
7afc82cf1d
devblog 2016-03-29 16:47:21 -04:00
Joey Hess
4b4a3b0152
todo 2016-03-29 16:44:09 -04:00
Joey Hess
fb656b9048
log --raw-date: Use to display seconds from unix epoch. 2016-03-29 14:39:16 -04:00
Joey Hess
6301543c00
prevent git-annex adjust changing things out from under the daemon 2016-03-29 13:57:48 -04:00
Joey Hess
8a69298bf2
init: Automatically enter the adjusted unlocked branch when in a v6 repo on a filesystem not supporting symlinks. 2016-03-29 13:54:42 -04:00
Joey Hess
bcd2350fc7
update 2016-03-29 13:30:29 -04:00
Joey Hess
42b7ccc89f
git annex add in adjusted unlocked branch
Cached the current branch lookup just because it seems unnecessary overhead
to run an extra git command per add to query the current branch.
2016-03-29 13:26:06 -04:00
Joey Hess
4226ae1040
updae 2016-03-29 12:50:25 -04:00
Joey Hess
4c9ca98769
docs for git-annex adjust 2016-03-29 11:39:43 -04:00
Joey Hess
70e8d6860e
Merge branch 'master' into adjustedbranch 2016-03-29 11:07:40 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
2fd7cc4bfe 2016-03-29 13:27:39 +00:00
Joey Hess
2ba851ff5d
OSX build updated for security fix; old obsolete builds for older versions removed as they contain vulnerable git 2016-03-28 12:51:16 -04:00
Joey Hess
53a1a38aeb
comment 2016-03-28 09:23:53 -04:00
Joey Hess
a60fbce826
comment 2016-03-28 09:21:37 -04:00
http://svario.it/gioele
891fdf7eaa 2016-03-28 09:58:25 +00:00
https://openid.stackexchange.com/user/27ceb3c5-0762-42b8-8f8a-ed21c284748f
7fc51f338c Added a comment: why not mimetypes for preferred content? 2016-03-28 08:32:45 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
f3148c4313 2016-03-27 00:58:22 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
61ad36c67d removed 2016-03-27 00:57:44 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
b476204254 2016-03-27 00:56:57 +00:00
Tobias
541ac227b7 Added a comment: History 2016-03-25 15:24:22 +00:00
185.16.53.225
74fbef73c8 poll vote (Same as for regular git-annex. ~/annex/) 2016-03-24 16:01:43 +00:00
anarcat
e16ba65caf Added a comment: git remote 2016-03-24 14:15:06 +00:00
Kalle
ecc5480828 Added a comment 2016-03-23 21:22:16 +00:00
b@526b37d9a821b5f9ce4e48014422239233ded155
309e16fc36 Added a comment: Fetch files from two (or more) remotes simultaneously? 2016-03-21 22:47:43 +00:00
Tobias
0266c28614 Added a comment: bare repository in direct mode 2016-03-21 21:28:57 +00:00
Kalle
55315a3a58 Added a comment: Different solution 2016-03-21 21:02:58 +00:00
Tobias
c4fb70038f 2016-03-21 10:14:27 +00:00
divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899
0dbcc7d6e8 2016-03-21 05:04:58 +00:00
divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899
d9657c0449 Added a comment 2016-03-21 04:13:15 +00:00
openmedi
e03c42aaa1 Added a comment 2016-03-19 17:08:19 +00:00
Joey Hess
1889abd874
update 2016-03-18 11:46:03 -04:00
Joey Hess
ff9f3508d9
add news item for git-annex 6.20160318 2016-03-18 11:35:40 -04:00
Joey Hess
63d87261f3
comment 2016-03-18 11:34:26 -04:00
Joey Hess
4fc3a79ea6
update 2016-03-18 11:30:27 -04:00
luukhendrix9@f5b077cf0dfcfec03c5f00e5df3c00279ef5c477
d594fc0146 2016-03-18 13:44:20 +00:00
Joey Hess
204dbf597d
well, that broke the i386ancient autobuilder. revert 2016-03-17 23:42:45 -04:00
Joey Hess
edbd46943f
update 2016-03-17 23:20:50 -04:00
Joey Hess
b482cb9d90
Fix build with stack 0.1.6 which needs explicit-setup-deps. 2016-03-17 23:14:37 -04:00
Joey Hess
4484c6a8b4
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-17 23:08:52 -04:00
Joey Hess
b418bed8d7
tracking bug 2016-03-17 23:08:39 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
eae56e9df3 Added page for mih user 2016-03-17 21:17:15 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
75838ad7ba Initiated page for a "datalad" user to join both yoh and mih pages 2016-03-17 21:16:41 +00:00
nanotech
91341559f7 2016-03-17 09:02:41 +00:00
nanotech
c126021871 Added a comment 2016-03-17 08:39:37 +00:00
torpidus
e029eb8b61 Added a comment 2016-03-16 22:23:26 +00:00
torpidus
0d541a3a23 2016-03-16 22:04:30 +00:00
openmedi
5845622c28 2016-03-16 21:16:07 +00:00
openmedi
4f171baa89 2016-03-16 21:05:31 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
784cb2463b Added a comment: re 2016-03-15 14:14:47 +00:00
Horus
7b84c2fef4 Added a comment 2016-03-15 08:53:15 +00:00
https://christian.amsuess.com/chrysn
91de23966a new issue with sharedRepository introdcued in 5.20151208 2016-03-15 07:58:08 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
786643dbf4 Added a comment 2016-03-14 21:10:56 +00:00