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
Richard Hartmann
c483e11cb3
Bump standards version
...
(cherry picked from commit 6efa2492bb
2016-03-12 13:02:37 -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
Joey Hess
b02f813ed8
bump process version in stack.yaml
...
Newer version than current lts has is needed on windows
2016-03-12 12:37:11 -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
41b7c5f6aa
implement another adjustment -- easy to do now!
2016-03-11 19:54:10 -04:00
Joey Hess
a85196bd4e
simplify adjustment reversal
2016-03-11 19:41:11 -04:00
Joey Hess
6c023e14ef
grafting new items into existing tree
2016-03-11 19:29:43 -04:00
Joey Hess
ad04550055
refactor
2016-03-11 16:45:40 -04:00
Joey Hess
f3b9c48a09
fixme
2016-03-11 16:37:31 -04:00
Joey Hess
ba1ef156a2
fix deletion of files in adjustTree
2016-03-11 16:30:06 -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
3c4ad3eeca
indent
2016-03-11 14:46:54 -04:00
Joey Hess
ec8eba18ad
fix warning
2016-03-11 14:33:38 -04:00
Joey Hess
fed8fcb99f
allow adding new items via adjustTree
2016-03-11 14:08:06 -04:00
Joey Hess
8d124beba8
add commitDiff, and clean up partial function
2016-03-11 13:15:49 -04:00
Joey Hess
fbf4d89e82
extract commit parent(s)
2016-03-11 12:47:14 -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
cbd38ef367
remove redundant start message
2016-03-09 15:04:00 -04:00
Joey Hess
fef272687e
Merge branch 'master' of ssh://git-annex.branchable.com
2016-03-09 13:46:41 -04:00
Joey Hess
4b3355cf3c
refactor
2016-03-09 13:43:22 -04:00
Joey Hess
276a67184c
fix typo in flags
2016-03-09 13:39:00 -04: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
viric@582d0845fdeae54b262502f49509b4577a5adbf8
3b081713ed
2016-03-09 16:44:05 +00:00
mail@f1d77c48f528d8c7b885900281887e045ad5114e
8f8ccc3899
Added a comment: Solution
2016-03-09 16:03:35 +00:00
mail@f1d77c48f528d8c7b885900281887e045ad5114e
83d321a72c
2016-03-09 11:24:27 +00:00
ellis
9f091ea5e8
Added a comment
2016-03-09 10:04:15 +00:00
