Joey Hess
696ab80d93
Merge branch 'master' of ssh://git-annex.branchable.com
2019-08-09 15:37:12 -04:00
Joey Hess
5798d063b0
make test_export_import work on adjusted branch
2019-08-09 14:00:22 -04:00
Joey Hess
b87ea12b6b
git-annex merge branch
...
* merge: When run with a branch parameter, merges from that branch.
This is especially useful when using an adjusted branch, because
it applies the same adjustment to the branch before merging it.
2019-08-09 13:21:15 -04:00
Horus
d174feeb0f
Added a comment
2019-08-09 07:51:07 +00:00
Lukey
aec95e48df
Added a comment: HOWTO
2019-08-08 20:21:11 +00:00
Joey Hess
69a5b5a27f
bug report
2019-08-08 15:11:56 -04:00
Joey Hess
298812a353
use separate main repo dir for each test suite pass
...
This way a failure to clean up the main repo dir from a previous pass
can't result in reusing that repo, which won't be configured right for the
current pass.
2019-08-08 14:29:28 -04:00
Joey Hess
70b71bf660
have init --version fail when repo is already initialized with other version
...
init: When the repo is already initialized, and --version requests a
different version, error out rather than silently not changing the version.
2019-08-08 14:13:02 -04:00
Joey Hess
022875274a
bug
2019-08-08 13:34:58 -04:00
Joey Hess
9e230cd448
work around adjusted unlocked branch problem in test suite
2019-08-08 13:28:04 -04:00
Ilya_Shlyakhter
5ceff99573
removed
2019-08-08 15:08:45 +00:00
Ilya_Shlyakhter
e1d97a92db
removed
2019-08-08 15:05:48 +00:00
Ilya_Shlyakhter
8ce06e4a8f
removed
2019-08-08 15:05:23 +00:00
Ilya_Shlyakhter
7421e214af
Added a comment: Git for Windows installation -- support for symlinks
2019-08-08 15:04:40 +00:00
Ilya_Shlyakhter
8bf7a44293
Added a comment: Git for Windows installation -- support for symlinks
2019-08-08 15:04:32 +00:00
Ilya_Shlyakhter
ae4eade74e
Added a comment: Git for Windows installation -- support for symlinks
2019-08-08 15:04:25 +00:00
Ilya_Shlyakhter
30c084f792
Added a comment: Git for Windows installation -- support for symlinks
2019-08-08 15:04:08 +00:00
Joey Hess
7598cc6362
fixed
2019-08-07 18:00:49 -04:00
Joey Hess
3adc251f9d
Build with silently-1.2.5.1 on Windows; the old one used "NUL" which is not supported with recent versions of ghc.
2019-08-07 17:42:16 -04:00
Joey Hess
ec64a08b2b
Merge branch 'master' of ssh://git-annex.branchable.com
2019-08-07 14:05:32 -04:00
Joey Hess
8042ae7eaa
comment
2019-08-07 14:05:20 -04:00
frederik@ffbea6a549cb3f460d110386c0f634c1ddc6a68a
e3ef6db1a1
2019-08-07 11:03:10 +00:00
Horus
b20b4c3d4c
2019-08-07 08:33:41 +00:00
Ilya_Shlyakhter
890a51485e
Added a comment: similar bug report
2019-08-05 17:55:21 +00:00
Ilya_Shlyakhter
5e6a143740
Added a comment: issues with concurrent copy
2019-08-05 17:53:38 +00:00
Joey Hess
8938102896
devblog
2019-08-05 13:52:07 -04:00
Joey Hess
0dd6ba302e
close
2019-08-05 13:44:24 -04:00
Joey Hess
3e0770e800
Merge branch 'git-lfs'
2019-08-05 13:44:04 -04:00
Joey Hess
fb7d92457f
support using gcrypt with git-lfs special remote
2019-08-05 13:43:45 -04:00
Joey Hess
c527ae5887
Merge branch 'master' into git-lfs
2019-08-05 11:48:45 -04:00
Joey Hess
3f450f0f4a
add encryption warning
2019-08-05 11:35:26 -04:00
Joey Hess
87e9ed38b8
expand encryption warning
2019-08-05 10:43:51 -04:00
Joey Hess
922434bccc
remove extra blank line
2019-08-05 10:37:19 -04:00
Joey Hess
bf7da09cf6
update
2019-08-05 10:36:46 -04:00
Joey Hess
f5eb28682a
expand
2019-08-04 13:59:24 -04:00
Joey Hess
8460bbcea9
note on git-lfs program
2019-08-04 13:16:59 -04:00
Joey Hess
c5ed11bc3f
documentation for git-lfs special remote
2019-08-04 13:15:47 -04:00
david@8424c56b088b73b1f9bd7d0497ca9b5752776099
9108927b86
2019-08-03 22:42:50 +00:00
yarikoptic
fba7da498b
2019-08-03 13:42:18 +00:00
leej
be31ef910f
Added a comment: Thank you, CFBundleShortVersionString is present and matches the internal git-annex version
2019-08-02 15:57:10 +00:00
leej
3731e511ab
removed
2019-08-02 15:49:58 +00:00
leej
bc38bca5ed
removed
2019-08-02 15:49:36 +00:00
leej
51e99b1502
Added a comment: Currently, 7.20190730 is expected but 7.20190709-gee3885d15 present on OSX/current
2019-08-02 15:49:20 +00:00
leej
6ee7a5f3c1
Added a comment: Currently, 7.20190730 is expected but 7.20190709-gee3885d15 present on OSX/current
2019-08-02 15:49:11 +00:00
leej
7e03cfd0ea
Added a comment: Currently, 7.20190730 is expected but 7.20190709-gee3885d15 present on OSX/current
2019-08-02 15:48:52 +00:00
Joey Hess
1cef791cf3
skeleton git-lfs special remote
...
This is a special remote and a git remote at the same time; git can pull
and push to it and git-annex can use it as a special remote.
Remote.Git has to check if it's configured as a git-lfs special remote
and sets it up as one if so.
Object methods not implemented yet.
2019-08-01 15:30:12 -04:00
Joey Hess
9c20a8792d
fix names of per-remote git config keys
...
These are all prefixed by annex- and always have been, the docs were just
wrong.
2019-08-01 14:24:59 -04:00
Joey Hess
74a36b8262
comment
2019-08-01 12:36:06 -04:00
Joey Hess
3d301dfb9f
comment
2019-08-01 12:26:28 -04:00
Joey Hess
404824594c
Merge branch 'master' of ssh://git-annex.branchable.com
2019-08-01 00:30:37 -04:00
