Joey Hess
bbe994295f
Fix build with ghc v7.11. Thanks, Gabor Greif.
2016-04-12 15:27:51 -04:00
Gabor Greif
7f6da40c78
simplify code to make it compilable with ghc v7.11.20150407
2016-04-12 15:26:40 -04:00
Joey Hess
e76cd0ec69
Merge branch 'master' of ssh://git-annex.branchable.com
2016-04-12 15:24:50 -04:00
Joey Hess
0ec7c281dd
prep release
2016-04-12 14:55:43 -04:00
Joey Hess
7815f227d2
update
2016-04-12 14:31:37 -04:00
Joey Hess
fdb6839cf7
update
2016-04-12 14:28:38 -04:00
Joey Hess
630fe90bf3
update
2016-04-12 14:24:48 -04:00
Joey Hess
eac26f13db
Fix bug in annex.largefiles mimetype= matching when git-annex is run in a subdirectory of the repository.
2016-04-12 14:19:34 -04:00
Joey Hess
c672481352
response
2016-04-12 13:40:32 -04:00
Joey Hess
8dbc009b1b
response
2016-04-12 13:16:47 -04:00
Joey Hess
ded990be8f
add simple test for conflict resolution in adjusted branch
...
This is not really extensive enough, but a start..
2016-04-12 13:01:31 -04:00
Jan
88afa9eb4e
Added a comment: git-annex on a PowerPC based synology?
2016-04-12 15:41:24 +00:00
Joey Hess
7d0a078e5c
todo
2016-04-11 11:40:19 -04:00
Joey Hess
113d948cd1
remove incorrect out of dateness warning
2016-04-11 11:26:44 -04:00
hugues.fontenelle@a0dfbe32c0e6575ef1eb2a2f13cd79ee8761de34
2375aec6c4
2016-04-11 10:53:16 +00:00
xloem
359ab36a6b
2016-04-11 01:43:50 +00:00
Antoine Beaupré
c043bd9faf
another thing i forgot
2016-04-10 19:20:37 -04:00
Antoine Beaupré
751abdd51f
fix for manpage generation without hacks
2016-04-10 19:13:01 -04:00
xloem
20ea3a9f9f
2016-04-10 22:42:11 +00:00
annexuser
642a7b50d4
2016-04-10 20:29:16 +00:00
j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077
56098f2ad5
Added a comment
2016-04-10 13:47:30 +00:00
j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077
9090987780
2016-04-10 13:07:32 +00:00
Joey Hess
5e190913a4
add AdjBranch newtype; some simplications
2016-04-09 15:10:26 -04:00
Joey Hess
17acfe8032
devblog
2016-04-09 14:20:34 -04:00
Joey Hess
8623f23aac
Merge branch 'master' of ssh://git-annex.branchable.com
2016-04-09 14:18:17 -04:00
Joey Hess
b5be04027c
change name of basis branch
...
Making the name look too much like the adjusted branch was ambiguous.
2016-04-09 14:17:20 -04:00
Joey Hess
7d28110c68
fix master push overwrite race when updating adjusted branch, by maintaining basis ref
2016-04-09 14:12:25 -04:00
Joey Hess
f0ddc0a75c
comment
2016-04-09 13:22:27 -04:00
spwhitton
bcc5e0bafc
file bug
2016-04-09 17:16:07 +00:00
Joey Hess
b3b1d72d57
Merge branch 'master' of ssh://git-annex.branchable.com
2016-04-09 12:31:27 -04:00
Antoine Beaupré
a5158baa89
possible fix for markdown generation with pandoc
2016-04-09 11:04:42 -04:00
Antoine Beaupré
c363bea652
attack the manpage problem
2016-04-09 10:40:53 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
d89161e13f
Added a comment: freenet special remote
2016-04-09 10:37:23 +00:00
Antoine Beaupré
d1dd9b5a4b
respond
2016-04-09 00:41:41 -04:00
ExGen
196547ec8d
Added a comment: comment 4
2016-04-08 22:00:33 +00:00
Joey Hess
c2ce3dfed3
windows does not like filenames starting with a dot, rename
2016-04-08 17:08:07 -04:00
ExGen
f970490750
Added a comment: comment 3^^
2016-04-08 21:03:15 +00:00
Joey Hess
56dee9af10
fix build with ghc 7.6.3
2016-04-08 16:09:00 -04:00
Joey Hess
c4be17d159
Merge branch 'master' of ssh://git-annex.branchable.com
2016-04-08 15:35:55 -04:00
Joey Hess
973d66bb67
update
2016-04-08 15:31:53 -04:00
Joey Hess
1e005feee2
fix build on windows with older ghc
2016-04-08 15:26:50 -04:00
Joey Hess
cf06dac2b8
hard links on windows
...
* annex.thin and annex.hardlink are now supported on Windows.
* unannex --fast now makes hard links on Windows.
2016-04-08 15:25:32 -04:00
Joey Hess
251405eca2
avoid withWorkTreeRelated affecting annex symlink calculation
2016-04-08 14:24:00 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
c0008c0c53
2016-04-08 16:35:37 +00:00
ggreif@8132a868199b4ffec14150c87f538dc06a538220
441dfba4c3
pull request for Bup.hs
2016-04-08 16:17:53 +00:00
Joey Hess
f41045bf19
Merge branch 'master' of ssh://git-annex.branchable.com
2016-04-06 19:32:01 -04:00
Joey Hess
555e235e1c
devbog
2016-04-06 19:26:25 -04:00
Joey Hess
64de6dcc74
one little bug..
2016-04-06 19:23:32 -04:00
Joey Hess
6549049142
fix commit tree after merge into adjusted branch
2016-04-06 19:22:15 -04:00
Joey Hess
887ef93a7f
run out of tree merge with --no-ff
...
This is how direct mode does it too, and somehow, for reasons that
currently escape me, this makes git merge not care if it's run with an
empty work tree.
2016-04-06 18:40:28 -04:00
