Joey Hess
fb8ab2469d
assistant: Fix bug that caused v6 pointer files to be annexed by the assistant.
2016-05-16 13:36:36 -04:00
Joey Hess
c61f038fc9
stage pointer file not annex link
2016-05-16 13:19:02 -04:00
Joey Hess
9f05be393e
adjust: If the adjusted branch already exists, avoid overwriting it, since it might contain changes that have not yet been propigated to the original branch.
...
Could not think of a foolproof way to detect if the old adjusted branch was
just behind the current branch. It's possible that the user amended the
adjusting commit at the head of the adjusted branch, for example.
I decided to bail in this situation, instead of just entering the old
branch, so that if git annex adjust succeeds the user is always in a
*current* adjusted branch, not some old and out of date one.
What could perhaps be done is enter the old branch and then update it. But
that seems too magical; the user may have rebased master or something or
may not want to propigate the changes from the old branch. Best to error
out.
2016-05-13 14:04:22 -04:00
Joey Hess
36cf163321
found a bad memory use in git
2016-05-12 17:26:33 -04:00
Joey Hess
0bbc6050f0
Merge branch 'master' of ssh://git-annex.branchable.com
2016-05-12 17:20:27 -04:00
Joey Hess
555a411cce
devblog
2016-05-12 17:19:55 -04:00
midfield
234f3ab1b5
Added a comment: v6 mode
2016-05-12 20:19:15 +00:00
midfield
811adffabd
2016-05-12 20:18:34 +00:00
Joey Hess
dd260706af
webapp: Avoid confusing display of dead remotes.
2016-05-12 16:12:16 -04:00
Joey Hess
a261a05c15
followup
2016-05-12 15:45:07 -04:00
Joey Hess
aa0bb64e6a
response
2016-05-12 15:31:40 -04:00
Joey Hess
d881850fe3
comment
2016-05-12 15:23:43 -04:00
Joey Hess
9fd09a657a
open bug from forum post
2016-05-12 15:14:30 -04:00
Joey Hess
8859065ecc
response
2016-05-12 15:11:28 -04:00
Joey Hess
844de6235b
response
2016-05-12 15:03:40 -04:00
Joey Hess
82c5223497
response
2016-05-12 14:46:48 -04:00
Joey Hess
0498d7388e
Merge branch 'master' of ssh://git-annex.branchable.com
2016-05-12 14:27:42 -04:00
Joey Hess
5cee93c4e5
link to my post "proposal for extending smudge/clean filters with raw file access"
2016-05-12 14:26:58 -04:00
openmedi
b21edb8d82
Added a comment
2016-05-12 07:49:33 +00:00
openmedi
eee9dafac8
Added a comment
2016-05-12 06:57:15 +00:00
openmedi
69a1afa5f0
Added a comment
2016-05-12 06:52:51 +00:00
midfield
e97ceaeaa6
2016-05-12 02:55:56 +00:00
paulK
34670bc816
2016-05-11 21:51:41 +00:00
annexuser
5d69c5f43b
Added a comment
2016-05-11 20:32:55 +00:00
Joey Hess
1f38328d3c
Merge branch 'master' of ssh://git-annex.branchable.com
2016-05-11 16:09:56 -04:00
Joey Hess
7cacd7888b
Change git annex info remote encryption description to use wording closer to what's used in initremote.
2016-05-11 16:09:39 -04:00
Joey Hess
695fa2ea3e
clarify some things
...
In particular, specifying multiple keyid= in enableremote/initremote
doesn't work, and never has AFAICS, so don't suggest using it.
Also, there was some public/private key wording confusion.
2016-05-11 15:58:19 -04:00
midfield
4633f0b1d9
2016-05-11 17:31:41 +00:00
Joey Hess
2c1f223226
add news item for git-annex 6.20160511
2016-05-11 13:00:32 -04:00
Joey Hess
c6e30e2b9b
prep release
2016-05-11 12:41:58 -04:00
Joey Hess
92fcf990d3
Merge branch 'master' of ssh://git-annex.branchable.com
2016-05-11 12:37:54 -04:00
Joey Hess
6337a5466e
support SharedPubKeyCipher here
2016-05-11 12:37:13 -04:00
openmedi
7fe4c3b5f4
rename forum/__34__git_annex_assitant_--stop__34___doesn__39__t_work_in_OSX_10.11.4.mdwn to forum/__34__git_annex_assistant_--stop__34___doesn__39__t_work_in_OSX_10.11.4.mdwn
2016-05-11 13:06:33 +00:00
openmedi
2c5de4da2f
2016-05-11 13:05:59 +00:00
cmt.miniBill@1ee673129c276f72c8d7c2974091af7618a22c2a
aeacc4474f
Fix typo
2016-05-11 07:14:25 +00:00
paulK
9c03a649c8
Bug report.
2016-05-11 00:52:34 +00:00
browneej@96fb43ae83ff25c968e65939805b60f3e42f1e06
b4bea642a6
Added a comment: git-annex on windows additional
2016-05-10 23:26:48 +00:00
browneej@96fb43ae83ff25c968e65939805b60f3e42f1e06
313cac0ae5
git-annex visibility on windows
2016-05-10 23:22:22 +00:00
browneej@96fb43ae83ff25c968e65939805b60f3e42f1e06
e6ddc1afd7
Added a comment
2016-05-10 22:44:47 +00:00
Joey Hess
2ca16e440c
typo
2016-05-10 17:43:50 -04:00
Joey Hess
7e007b6475
typo
2016-05-10 17:41:31 -04:00
Joey Hess
45ca1886e6
rename to legal ikiwiki filename
2016-05-10 17:18:21 -04:00
Joey Hess
b0b0cfff2c
devblog
2016-05-10 17:16:59 -04:00
Joey Hess
4c5cb82789
close; done in v6 mode
2016-05-10 17:15:27 -04:00
Joey Hess
dd2a5d8295
close
2016-05-10 17:07:59 -04:00
Joey Hess
e8121245b5
close
2016-05-10 17:06:43 -04:00
Joey Hess
a0e3382985
response
2016-05-10 17:03:27 -04:00
Joey Hess
28f8ab5939
Merge branch 'master' of ssh://git-annex.branchable.com
2016-05-10 16:53:50 -04:00
Joey Hess
e219289c83
Added new encryption=sharedpubkey mode for special remotes.
...
This is useful for makking a special remote that anyone with a clone of the
repo and your public keys can upload files to, but only you can decrypt the
files stored in it.
2016-05-10 16:50:31 -04:00
pixunil
9b77752a93
Added a comment
2016-05-10 20:45:57 +00:00
