Commit graph

1545 commits

Author SHA1 Message Date
Joey Hess
cbb4433449
comment 2016-04-25 13:47:27 -04:00
Joey Hess
4c573815f9
close todos covered by rclone 2016-04-25 13:43:24 -04:00
branchable@d31204a44f76a567b0ac1ace14680d4f2ec7750d
26d64d7355 made link a link 2016-04-23 19:14:59 +00:00
branchable@d31204a44f76a567b0ac1ace14680d4f2ec7750d
6cdd633936 mentioned git-annex-remote-rclone 2016-04-23 19:13:49 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
07ca2bb416 2016-04-22 19:05:45 +00:00
Joey Hess
7945dd3c3e
refactor 2016-04-22 14:35:48 -04:00
Joey Hess
46e3319995
assistant: Deal with upcoming git's refusal to merge unrelated histories by default
git 2.8.1 (or perhaps 2.9.0) is going to prevent git merge from merging in
unrelated branches. Since the webapp's pairing etc features often combine
together repositories with unrelated histories, work around this behavior
change by setting GIT_MERGE_ALLOW_UNRELATED_HISTORIES when the assistant
merges.

Note though that this is not done for git annex sync's merges, so
it will follow git's default or configured behavior.
2016-04-22 14:26:44 -04:00
Joey Hess
8ab27235ea
reinject: Added new mode which can reinject known files into the annex.
For example: git-annex reinject --known /mnt/backup/*
2016-04-22 13:49:32 -04:00
Joey Hess
b4cb1093bb
todo 2016-04-21 14:24:06 -04:00
CandyAngel
53c7c246a6 Added a comment 2016-04-21 11:41:09 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
caba449869 Added a comment 2016-04-20 19:21:33 +00:00
Joey Hess
da4ff16805
comment 2016-04-20 14:36:46 -04:00
Joey Hess
1bfea9b3e5
calckey: New plumbing command, calculates the key that would be used to refer to a file 2016-04-20 13:50:26 -04:00
Joey Hess
9d952fe9d1
reinject: When src file's content cannot be verified, leave it alone, instead of deleting it. 2016-04-20 13:21:56 -04:00
Joey Hess
b949e85045
remove old closed bugs and todo items to speed up wiki updates and reduce size
Remove closed bugs and todos that were last edited or commented before Q3 2015.

Command line used:

for f in $(grep -l '\[\[done\]\]' -- *.mdwn); do d="$(echo "$f" | sed 's/.mdwn$//')"; if [ -z "$(git log --since=09-09-2015 --pretty=oneline -- "$f")" -a -z "$(git log --since=09-09-2015 --pretty=oneline -- "$d")" ]; then git rm -- "$f"; git rm -rf "$d"; fi; done
for f in $(grep -l '|done\]\]' -- *.mdwn); do d="$(echo "$f" | sed 's/.mdwn$//')"; if [ -z "$(git log --since=09-09-2015 --pretty=oneline -- "$f")" -a -z "$(git log --since=09-09-2015 --pretty=oneline -- "$d")" ]; then git rm -- "$f"; git rm -rf "$d"; fi; done
2016-04-19 13:55:29 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
8140aa58ea removed 2016-04-16 11:53:24 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
6403964cb6 Added a comment: Assistant support 2016-04-16 11:52:34 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
ab2ba2f37f Added a comment: Assistant support 2016-04-16 11:52:14 +00:00
Joey Hess
b19511822a
update 2016-04-13 13:39:16 -04:00
Joey Hess
bbe994295f
Fix build with ghc v7.11. Thanks, Gabor Greif. 2016-04-12 15:27:51 -04:00
Joey Hess
7815f227d2
update 2016-04-12 14:31:37 -04:00
Joey Hess
630fe90bf3
update 2016-04-12 14:24:48 -04:00
Joey Hess
7d0a078e5c
todo 2016-04-11 11:40:19 -04: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
Joey Hess
f0ddc0a75c
comment 2016-04-09 13:22:27 -04: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
Joey Hess
c2ce3dfed3
windows does not like filenames starting with a dot, rename 2016-04-08 17:08:07 -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
ggreif@8132a868199b4ffec14150c87f538dc06a538220
441dfba4c3 pull request for Bup.hs 2016-04-08 16:17:53 +00:00
Joey Hess
68ef108cb7
another reason 2016-04-05 14:29:33 -04:00
ExGen
6b2425d7bf Added a comment: Harlinks 2016-04-03 11:21:02 +00:00
ExGen
730e1aee68 Added a comment: Harlinks 2016-04-02 23:32:24 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
6509834f3d Added a comment: cache? 2016-04-01 19:56:44 +00:00
Joey Hess
11d76f0c8e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-31 19:07:03 -04:00
Joey Hess
ed3e8e1886
Merge branch 'adjustedbranch' 2016-03-31 19:05:47 -04:00
anarcat
02cdd59bb6 another batch? 2016-03-31 14:08:03 +00:00
Joey Hess
93f5ccc808
update 2016-03-30 16:01:59 -04:00
Joey Hess
d72b85d437
update 2016-03-30 15:55:18 -04:00
Joey Hess
fb656b9048
log --raw-date: Use to display seconds from unix epoch. 2016-03-29 14:39:16 -04:00
Joey Hess
8a69298bf2
init: Automatically enter the adjusted unlocked branch when in a v6 repo on a filesystem not supporting symlinks. 2016-03-29 13:54:42 -04:00
http://svario.it/gioele
891fdf7eaa 2016-03-28 09:58:25 +00:00
Joey Hess
31480a54e2
close 2016-03-14 16:47:32 -04:00
karl
48b2357963 2016-03-13 16:01:03 +00: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