Commit graph

27786 commits

Author SHA1 Message Date
Joey Hess
5ae4c1987f
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-10 14:07:36 -04:00
Joey Hess
e35ba6c1e6
update 2016-05-10 14:07:13 -04:00
pixunil
6c54ca54e1 Added a comment: git config 2016-05-10 17:59:10 +00:00
Joey Hess
76522065ae
comment 2016-05-10 13:54:27 -04:00
CandyAngel
4a0bc1bfdd Added a comment 2016-05-10 17:44:38 +00:00
Joey Hess
2d0c7a23e9
Merge remote-tracking branch 'origin/master' 2016-05-10 13:38:33 -04:00
Joey Hess
7d48df6d77
comment 2016-05-10 13:38:31 -04:00
Joey Hess
e9f131cd41
comment 2016-05-10 13:27:50 -04:00
pixunil
38470a378d Added a comment: more information 2016-05-10 17:27:46 +00:00
Joey Hess
ae65aecb0b
fsck: When a key is not previously known in the location log, record something so that reinject --known will work. 2016-05-10 13:20:45 -04:00
Joey Hess
9169234c34
fix overindent 2016-05-10 13:08:24 -04:00
Joey Hess
3f1aaa84c5
Added annex.gnupg-decrypt-options and remote.<name>.annex-gnupg-decrypt-options, which are passed to gpg when it's decrypting data.
The naming is unofrtunately not consistent, but the gnupg-options
were only used for encrypting, and it's too late to change that.

It would be nice to have a third setting that is always passed to gnupg,
but ~/.gnupg/options can be used to specify such global options when really
needed.
2016-05-10 13:03:56 -04:00
Joey Hess
5f1c316b0c
followup 2016-05-10 12:29:01 -04:00
Joey Hess
7de5cbfaa5
response 2016-05-10 12:18:05 -04:00
Joey Hess
0092d16eb5
followu 2016-05-10 12:17:25 -04:00
openmedi
7cefaf548a Added a comment 2016-05-10 14:42:21 +00:00
openmedi
a9f5648b14 Added a comment 2016-05-10 14:40:18 +00:00
openmedi
700138092f 2016-05-10 14:38:08 +00:00
CandyAngel
73ad85c8d3 2016-05-10 07:25:09 +00:00
browneej@96fb43ae83ff25c968e65939805b60f3e42f1e06
7f1000d9f3 2016-05-09 17:11:27 +00:00
openmedi
8705c48615 rename forum/How_to_find_out_if_assitant_is_still_repairing__63__.mdwn to forum/How_to_find_out_if_assistant_is_still_repairing__63__.mdwn 2016-05-09 11:49:23 +00:00
openmedi
f7c8fe7334 2016-05-09 11:46:45 +00:00
pixunil
1482eb09fa 2016-05-07 19:16:13 +00:00
pixunil
55beb17769 2016-05-07 19:09:14 +00:00
xloem
2f84557979 removed 2016-05-07 12:34:59 +00:00
xloem
d187f771b9 2016-05-07 12:26:13 +00:00
Joey Hess
c456833179
Windows: Fix an over-long temp directory name. 2016-05-06 12:49:41 -04:00
Joey Hess
e08082ce72
followup, close 2016-05-06 12:34:50 -04:00
Joey Hess
6659c7ec0e
Propigate GIT_DIR and GIT_WORK_TREE environment to external special remotes.
Since git-annex unsets these when started, they have to be explicitly
propigated. Also, this makes --git-dir and --work-tree settings be
reflected in the environment.

The need for this came up in
https://github.com/DanielDent/git-annex-remote-rclone/issues/3
2016-05-06 12:26:44 -04:00
xloem
36137c444b Added a comment 2016-05-06 11:19:43 +00:00
jean.jordaan@4bb3bd508a9eb0a4bab5d1b587dadd2b6c4a7edc
764e816156 2016-05-06 06:00:21 +00:00
slowbyte@142ac4d0d3edb8ed7be2fa944db64ee067115f0e
56d3d31918 2016-05-06 05:37:55 +00:00
openmedi
d72b80c5cc 2016-05-06 00:47:43 +00:00
annexuser
80f1ea50ea Added a comment 2016-05-05 23:57:13 +00:00
openmedi
fad7dcc19b 2016-05-05 21:50:54 +00:00
Joey Hess
ddbe00832a
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-05 16:06:39 -04:00
Joey Hess
0897da391e
version: Display OS version and architecture too. 2016-05-05 16:06:01 -04:00
Joey Hess
55eec1b72a
Setup: avoid trying to install man pages and desktop files on Windows 2016-05-05 16:05:27 -04:00
Joey Hess
f9f5860590
squash build warning on windows 2016-05-05 15:53:31 -04:00
Joey Hess
93192b9279
fix build warning on windows and android 2016-05-05 15:49:56 -04:00
Joey Hess
6cf9dbb564
fix build warning on windows 2016-05-05 15:48:58 -04:00
Joey Hess
2862eb9d59
new simpler windows build environment using stack and git for windows and no cygwin 2016-05-05 15:47:01 -04:00
Joey Hess
3e79a2f114
enable explicit-setup-deps 2016-05-05 15:37:42 -04:00
annexuser
87567080a2 Added a comment 2016-05-05 18:11:49 +00:00
Joey Hess
cf587a795e
comment 2016-05-05 11:56:06 -04:00
Joey Hess
bf2c18b9d4
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-05 11:55:24 -04:00
Joey Hess
dce4b1a189
improve info display of OtherStorageClass 2016-05-05 11:54:59 -04:00
rustikus@9db90d0c115a1825e2f1e5f15257ec1298a6c7b6
a5bec6c70b 2016-05-05 13:41:53 +00:00
simon.parzer@f837bbade0d93f560dc574b04e835b7875c4026f
0965ddb954 Added a comment: Python script to recover git annex' lost files 2016-05-05 12:01:46 +00:00
simon.parzer@f837bbade0d93f560dc574b04e835b7875c4026f
6d2d975e78 removed 2016-05-05 11:59:03 +00:00