Commit graph

20081 commits

Author SHA1 Message Date
Joey Hess
bd4ad3d2e8
comment 2016-03-14 16:37:55 -04:00
Joey Hess
f2772f469a
followup 2016-03-14 15:54:46 -04:00
Joey Hess
11d31f53bf
comment 2016-03-14 13:55:57 -04:00
Joey Hess
5633e8ed50
comment 2016-03-14 13:50:47 -04:00
Joey Hess
dc2da86939
comment 2016-03-14 13:38:41 -04:00
Joey Hess
6bc44d5d16
comment 2016-03-14 13:30:25 -04:00
Joey Hess
7398fc36f2
response 2016-03-14 13:26:26 -04:00
Horus
8f362565a8 Added a comment 2016-03-14 08:18:50 +00:00
torpidus
1d81caedfe 2016-03-13 19:19:13 +00:00
torpidus
82f7582f8f removed 2016-03-13 19:18:39 +00:00
karl
48b2357963 2016-03-13 16:01:03 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
0d9f3bdae0 2016-03-13 11:32:35 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
bef922be21 2016-03-13 11:28:17 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
b28f32e47f 2016-03-13 11:20:49 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
a1765ecf8c 2016-03-13 11:19:39 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
e191f127eb 2016-03-13 11:16:09 +00:00
Joey Hess
92877bb5d0
windows git seems to fail to checkout foo.../bar ; rename 2016-03-12 13:57:07 -04:00
Joey Hess
8b653bf9ef
remove danging comment with * in its filename 2016-03-12 13:51:25 -04:00
Joey Hess
348105debc
fix links 2016-03-12 13:47:31 -04:00
Joey Hess
2eae70353d
remove note about cygwin git 2016-03-12 13:45:31 -04:00
Joey Hess
4205e93c1e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-12 12:58:02 -04:00
Joey Hess
7125a1fb27
rename files containing :
This is mostly to let the repo check out on windows w/o using cygwin's git.

But, bash completion is also crap with : , so ..
2016-03-12 12:57:18 -04:00
Richard Hartmann
b1b80e6dec Typo 2016-03-12 15:13:46 +01:00
Joey Hess
7a01f60eed
update 2016-03-11 20:16:02 -04:00
Joey Hess
cc44813550
simplify 2016-03-11 20:12:31 -04:00
Joey Hess
26405c107a
devblog 2016-03-11 19:55:27 -04:00
Joey Hess
b9184f69a7
improve propigation of commits from adjusted branches
Only reverse adjust the changes in the commit, which means that adjustments
do not need to be generally cleanly reversable.

For example, an adjustment can unlock all locked files, but does not need
to worry about files that were originally unlocked when reversing, because
it will only ever be run on files that have been changed. So, it's ok
if it locks all files when reversed, or even leaves all files as-is when
reversed.
2016-03-11 16:05:06 -04:00
Joey Hess
97e97dccda
Merge branch 'master' into adjustedbranch 2016-03-11 12:21:26 -04:00
mark@6b90344cdab3158eacb94a3944460d138afc9bef
c20e8d17db 2016-03-10 22:46:42 +00:00
Horus
662fc7fc75 2016-03-10 21:40:31 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
11a5985389 2016-03-10 15:16:33 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
7ca35b766f Added a comment 2016-03-10 04:36:12 +00:00
ellis
ea57543394 Added a comment 2016-03-09 19:15:10 +00:00
Joey Hess
9039bdb4ea
Always try to thaw content, even when annex.crippledfilesystem is set. 2016-03-09 13:33:13 -04:00
Joey Hess
d201e6c359
add todo from comment 2016-03-09 13:21:55 -04:00
Joey Hess
e4c22ad5bb
comment 2016-03-09 13:15:43 -04:00
Joey Hess
5e0843e4b8
close 2016-03-09 13:14:27 -04:00
Joey Hess
0cdd4f9f58
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-09 13:13:28 -04:00
Joey Hess
c6f81e8ef5
done 2016-03-09 12:54:22 -04:00
Joey Hess
01f0dfc4ff
followup 2016-03-08 16:42:43 -04:00
ellis
70bf11d3d0 Added a comment 2016-03-08 19:52:21 +00:00
ellis@9dd4c3615b5ff78a457c5832488610886fd6b255
05b4d9cc98 Added a comment 2016-03-08 19:26:03 +00:00
Joey Hess
b095561e70
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-07 16:26:30 -04:00
Joey Hess
3454b8bc33
devblog 2016-03-07 16:24:39 -04:00
Horus
951857d31f Added a comment 2016-03-07 20:11:03 +00:00
Joey Hess
9cff9ff02c
response 2016-03-07 15:13:01 -04:00
Joey Hess
4cef8739bb
comment 2016-03-07 13:26:05 -04:00
Joey Hess
d3775e741e
followup 2016-03-07 13:24:11 -04:00
Joey Hess
e8d6dc9527
followup 2016-03-07 13:21:47 -04:00
Joey Hess
a07fd19ce9
dropkey --json 2016-03-06 12:58:36 -04:00