mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
20689 commits 13 branches 442 tags 103 MiB
Commit graph

15000 commits

Author SHA1 Message Date
http://joeyh.name/
15c4a21c81 Added a comment 2014-07-14 18:38:58 +00:00
Joey Hess
b0c5704ae3 already fixed 2014-07-14 14:37:42 -04:00
Joey Hess
618b1d2a38 improve documentation 2014-07-14 14:37:14 -04:00
http://joeyh.name/
1906ffca53 Added a comment 2014-07-14 18:33:25 +00:00
http://joeyh.name/
3bf484a7dc Added a comment 2014-07-14 18:30:38 +00:00
http://joeyh.name/
309f180130 Added a comment 2014-07-14 18:27:43 +00:00
http://joeyh.name/
1663ee3d3f Added a comment 2014-07-14 18:21:15 +00:00
annexuser
98333c511d Added a comment 2014-07-14 18:21:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmveNWaFIL1zEehHr_0416bKBzsul5tGlE
e86807ea0b 2014-07-14 10:11:31 +00:00
sts
62d5fa1a17 Added a comment 2014-07-14 09:12:13 +00:00
divB
05311ae0f6 2014-07-14 02:39:15 +00:00
divB
26821a851b 2014-07-14 02:23:35 +00:00
jg123h12jh3y12g3y
09d9aa656e 2014-07-14 02:08:55 +00:00
jg123h12jh3y12g3y
5254ef67ba 2014-07-14 02:05:14 +00:00
sts
92c3c7f961 2014-07-13 09:04:24 +00:00
lex
48868f5b01 2014-07-13 06:52:38 +00:00
zardoz
a384c61d57 2014-07-12 20:12:36 +00:00
http://ypid.wordpress.com/
53210e3220 Added a comment: gitignore 2014-07-12 17:59:42 +00:00
http://svario.it/gioele
df53f96063 new feature: do not import new files 2014-07-12 14:18:59 +00:00
http://svario.it/gioele
68455bbe4e New bug "sync does not commit with alwasycommit = false" 2014-07-12 10:59:49 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
2f54ec7727 Added a comment 2014-07-12 10:03:07 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
191477bb9f Added a comment 2014-07-12 10:00:59 +00:00
http://svario.it/gioele
4059b9aefe New topic "Recovering from a bad sync" 2014-07-12 09:00:19 +00:00
divB
f6b3f61c30 2014-07-12 02:28:32 +00:00
divB
0985ce2925 2014-07-12 02:07:46 +00:00
divB
58f1065fe5 Added a comment 2014-07-11 21:56:29 +00:00
divB
ebe00602b5 Added a comment 2014-07-11 21:43:11 +00:00
Joey Hess
398ad93afa Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-11 17:00:50 -04:00
Joey Hess
d71aaabeab devblog 2014-07-11 17:00:20 -04:00
Joey Hess
cb66ca3a76 resolvemerge: New plumbing command that runs the automatic merge conflict resolver. 2014-07-11 16:45:18 -04:00
http://joeyh.name/
e69d37a0ae Added a comment 2014-07-11 20:17:06 +00:00
http://joeyh.name/
0f43fc0116 Added a comment 2014-07-11 19:57:36 +00:00
Joey Hess
003ebf58f5 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-11 15:53:02 -04:00
Joey Hess
aadf11cf99 moreinfo 2014-07-11 15:52:54 -04:00
http://joeyh.name/
ac152c1255 Added a comment 2014-07-11 19:46:05 +00:00
http://joeyh.name/
348866612f Added a comment 2014-07-11 19:42:24 +00:00
http://joeyh.name/
7aff9410e0 Added a comment 2014-07-11 19:40:32 +00:00
http://joeyh.name/
53e1d72a30 Added a comment: unable to reproduce, please provide transcript 2014-07-11 19:36:37 +00:00
Joey Hess
793004e2c2 moreinfo 2014-07-11 15:34:41 -04:00
http://joeyh.name/
7003be56ad Added a comment 2014-07-11 19:31:52 +00:00
http://joeyh.name/
d5ec73d200 Added a comment 2014-07-11 19:29:06 +00:00
Joey Hess
50b1cd917a Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-11 14:52:57 -04:00
Joey Hess
c5f132e3e7 uninit: Avoid failing final removal in some direct mode repositories due to file modes. 
Specifically .map files.
 2014-07-11 14:52:53 -04:00
http://joeyh.name/
b88a04346a Added a comment 2014-07-11 18:41:32 +00:00
Joey Hess
ee9ffcd940 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-11 14:30:59 -04:00
http://joeyh.name/
5636ba495b Added a comment 2014-07-11 18:30:55 +00:00
http://joeyh.name/
76ff54c246 Added a comment 2014-07-11 18:27:44 +00:00
http://joeyh.name/
694a44b464 Added a comment 2014-07-11 18:15:09 +00:00
Joey Hess
e8845fc9b5 close; local misconfiguration 2014-07-11 14:13:24 -04:00
http://joeyh.name/
ad1eabe61d Added a comment: obvious questions 2014-07-11 18:12:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
da4be5c108 Added a comment 2014-07-11 18:10:06 +00:00
http://joeyh.name/
e265748fd7 Added a comment 2014-07-11 18:09:51 +00:00
Joey Hess
f22a77890e improve documentation about sync 2014-07-11 14:08:40 -04:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
91f834d20e Added a comment 2014-07-11 17:11:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
6a2ae73f42 Added a comment 2014-07-11 17:06:43 +00:00
zardoz
07c322752c 2014-07-11 13:27:00 +00:00
zardoz
4f0ca08ba5 Added a comment 2014-07-11 11:54:26 +00:00
zardoz
089a23b291 Added a comment 2014-07-11 11:46:08 +00:00
CandyAngel
3355275161 Added a comment 2014-07-11 10:57:58 +00:00
CandyAngel
f59fc3da9f Added a comment 2014-07-11 10:41:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmveNWaFIL1zEehHr_0416bKBzsul5tGlE
ff6f62e544 2014-07-11 10:08:06 +00:00
http://svario.it/gioele
bcf5c41904 New bug: git-annex sync does not push 2014-07-11 09:25:14 +00:00
http://svario.it/gioele
b0eef01f37 Added a comment: GPG_AGENT_INFO was already set in the outside shell 2014-07-11 07:19:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmveNWaFIL1zEehHr_0416bKBzsul5tGlE
fac19f5b91 Added a comment: Install fails horribly 2014-07-10 23:11:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawndSPd52H_L7hcYsJjLQ4kR1LopprHy7Xw
3700fb00af 2014-07-10 22:37:59 +00:00
Joey Hess
f14890bf82 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-10 17:06:23 -04:00
Joey Hess
9d71903c2f migrate: Avoid re-checksumming when migrating from hashE to hash backend. 2014-07-10 17:06:04 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk3JJvaarUKd7xShCMze_kpHVcuCzFrWTI
ab233c9a1c 2014-07-10 21:03:50 +00:00
Joey Hess
564de5e508 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-10 16:28:13 -04:00
Joey Hess
b66b33c87f promote comment to todo 2014-07-10 16:27:12 -04:00
http://joeyh.name/
5553c4dcd6 Added a comment 2014-07-10 20:24:04 +00:00
http://joeyh.name/
6bfc13556f Added a comment 2014-07-10 20:16:28 +00:00
http://joeyh.name/
fe80c9897a Added a comment 2014-07-10 19:59:15 +00:00
http://joeyh.name/
29d2b5bf22 Added a comment 2014-07-10 19:54:30 +00:00
http://joeyh.name/
3a6cb53e96 Added a comment 2014-07-10 19:50:38 +00:00
http://joeyh.name/
79ce1a226f Added a comment 2014-07-10 19:41:54 +00:00
http://joeyh.name/
98a051eab8 Added a comment 2014-07-10 19:37:38 +00:00
Joey Hess
32b2f2af38 moreinfo 2014-07-10 15:26:04 -04:00
Joey Hess
f0fc2568d7 move to todo 2014-07-10 15:18:12 -04:00
Joey Hess
088816353e Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-10 15:18:02 -04:00
http://joeyh.name/
d651e3cf7a Added a comment 2014-07-10 19:19:36 +00:00
http://joeyh.name/
2a7fd68d47 Added a comment 2014-07-10 19:10:15 +00:00
Joey Hess
be2c77d0cb close 2014-07-10 15:08:30 -04:00
Joey Hess
3c10d8ce57 retitle 2014-07-10 15:05:01 -04:00
Joey Hess
b9892e2344 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-10 15:02:30 -04:00
http://joeyh.name/
56b2b49440 Added a comment: user misconfiguration 2014-07-10 19:02:00 +00:00
Joey Hess
5d34472f82 close; user misconfiguration 2014-07-10 15:00:22 -04:00
http://joeyh.name/
4f62105aa3 Added a comment 2014-07-10 18:48:17 +00:00
Joey Hess
e538f0e980 notabug 2014-07-10 14:24:46 -04:00
http://joeyh.name/
fc48c3bb23 Added a comment 2014-07-10 18:24:17 +00:00
Joey Hess
4c61590541 tagging 2014-07-10 14:22:54 -04:00
http://joeyh.name/
50781a4a5f Added a comment 2014-07-10 18:11:22 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
9bad3ed3b7 removed 2014-07-10 15:30:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
30d3bd9458 2014-07-10 15:01:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
e488af18b8 still not working 2014-07-10 13:57:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
64748d8094 solution ok 2014-07-10 11:55:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnov5q9_Cl4Ps5NoYE08yE01NLSvBANnY8
61222ad293 Added a comment 2014-07-10 05:50:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
ed153b50d5 small change 2014-07-10 03:07:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
ae676c1bee partially solved 2014-07-10 03:06:17 +00:00
divB
85ae4ce94c 2014-07-10 03:05:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
c30ac2bebe missing word 2014-07-10 02:29:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
7648a6602b formatting 2014-07-10 02:02:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
6c6a5dff0d 2014-07-10 02:01:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao
ac90d4f570 Added a comment: even a client repository you had once but have now deleted 2014-07-09 22:08:44 +00:00
Joey Hess
99d3010618 devblog 2014-07-09 16:20:02 -04:00
Joey Hess
f15d2aa35d update 2014-07-09 16:16:32 -04:00
Joey Hess
0f382a0256 add news item for git-annex 5.20140709 2014-07-09 16:08:50 -04:00
Joey Hess
566e8041ae Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-09 15:32:21 -04:00
http://joeyh.name/
dd171168e4 Added a comment: more confirmation of race theory 2014-07-09 19:26:55 +00:00
Joey Hess
99521fee79 close, with fairly high confidence, but not certainty, due to difficulty reproducing races.. 2014-07-09 15:21:27 -04:00
Joey Hess
6fe35aab87 Really fix bug that caused the assistant to make many unncessary empty merge commits. 2014-07-09 15:18:00 -04:00
Joey Hess
d76b5a674f Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-09 15:09:49 -04:00
Joey Hess
58acaf8026 prospective fix for bad_merge_commit_deleting_all_files 
Assuming my analysis of a race is correct. In any case, this certianly closes a
race..
 2014-07-09 15:08:19 -04:00
http://joeyh.name/
2e102ce248 Added a comment 2014-07-09 19:01:33 +00:00
http://joeyh.name/
73271cbcf4 Added a comment 2014-07-09 19:00:35 +00:00
Joey Hess
4915f9ad03 format 2014-07-09 14:50:42 -04:00
http://jamesjustjames.wordpress.com/
dbfab63576 removed 2014-07-09 18:51:27 +00:00
http://jamesjustjames.wordpress.com/
bf2ac843d2 Added a comment: The guy with this bug. 2014-07-09 18:50:36 +00:00
http://jamesjustjames.wordpress.com/
36de0da227 Added a comment: The guy with this bug. 2014-07-09 18:50:25 +00:00
http://joeyh.name/
07bb6b3748 Added a comment 2014-07-09 18:36:36 +00:00
http://joeyh.name/
5fe0f1e939 Added a comment: theory 2014-07-09 18:31:07 +00:00
http://joeyh.name/
b76295a396 Added a comment 2014-07-09 18:25:08 +00:00
http://joeyh.name/
7871699567 Added a comment 2014-07-09 18:20:14 +00:00
http://joeyh.name/
68ba0f8ab8 Added a comment 2014-07-09 17:58:48 +00:00
Joey Hess
4de0b1693e more info 2014-07-09 13:43:22 -04:00
Joey Hess
6272d09031 bug 2014-07-09 13:39:02 -04:00
http://ypid.wordpress.com/
1220afaffe 2014-07-09 16:55:17 +00:00
http://svario.it/gioele
9ca4270cce new bug gpg does not ask for password inside tmux 2014-07-09 16:54:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI8
6d80ff2a7e 2014-07-09 16:03:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI8
0091552e38 Added a comment 2014-07-09 15:32:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI8
856bfcfccf Added a comment: Same happening here 2014-07-09 14:45:32 +00:00
http://mildred.fr/
855409db88 2014-07-09 14:17:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnu1NjsjNS3m0OxiYLKO-5SKNpSERxpi6k
ac4149706f Added a comment 2014-07-09 13:56:31 +00:00
zardoz
6b165db9cc Added a comment 2014-07-09 09:02:59 +00:00
zardoz
7ed729ae51 Added a comment 2014-07-09 08:51:22 +00:00
zardoz
b78752480e 2014-07-09 08:39:58 +00:00
zardoz
cd5198a391 Added a comment 2014-07-09 07:07:27 +00:00
http://olivier.mehani.name/
a3e7a98445 Added a comment 2014-07-09 01:09:33 +00:00
EskildHustvedt
3cf23c5b47 Added a comment 2014-07-09 00:24:37 +00:00
EskildHustvedt
99424c47d4 Reopening 2014-07-09 00:15:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn0aWOz5xMj5VuexPl55h7IasQnsh7sVwE
4f5a81dac4 Added a comment: It works now 2014-07-08 22:47:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao
15f3602f61 Added a comment: package in debian backports shows the same error mesage 2014-07-08 19:25:19 +00:00
zardoz
c61fdd140e Added a comment 2014-07-08 19:17:29 +00:00
Joey Hess
7db532d53b Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-08 13:57:39 -04:00
Joey Hess
ba42b67c70 Fix bug in automatic merge conflict resolution 
When one side is an annexed symlink, and the other side is a non-annexed symlink.

In this case, git-merge does not replace the annexed symlink in the work
tree with the non-annexed symlink, which is different from it's handling of
conflicts between annexed symlinks and regular files or directories.
So, while git-annex generated the correct merge commit, the work tree
didn't get updated to reflect it.
See comments on bug for additional analysis.

Did not add this to the test suite yet; just unloaded a truckload of firewood
and am feeling lazy.

This commit was sponsored by Adam Spiers.
 2014-07-08 13:55:11 -04:00
http://joeyh.name/
3dcb349409 Added a comment: analysis 2014-07-08 17:52:59 +00:00
http://joeyh.name/
0c4f66f0c6 Added a comment 2014-07-08 17:31:53 +00:00
zardoz
5340e632ec 2014-07-08 17:22:51 +00:00
Joey Hess
1d966dbe37 confirmed 2014-07-08 12:57:43 -04:00
Joey Hess
67c4cef5e9 fixed 2014-07-08 12:57:13 -04:00
Joey Hess
58dcefc55e Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-08 12:47:16 -04:00
http://joeyh.name/
8c9c55c8ce Added a comment 2014-07-08 16:44:32 +00:00
Joey Hess
eb015a1c96 update month 2014-07-08 12:39:07 -04:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
42df533f9c 2014-07-08 14:06:31 +00:00
zardoz
1b3c94b82d 2014-07-08 13:16:10 +00:00
zardoz
0b1ec79069 Added a comment 2014-07-08 12:26:59 +00:00
CandyAngel
ac8f1925be 2014-07-08 11:56:54 +00:00
EskildHustvedt
e66d336976 Added a comment 2014-07-08 08:13:40 +00:00
divB
67d4430b6e 2014-07-08 07:41:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns
6a170c6671 2014-07-08 06:38:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn0aWOz5xMj5VuexPl55h7IasQnsh7sVwE
2de177aba4 2014-07-08 00:34:53 +00:00
feulif
cc3f94c838 2014-07-07 22:03:53 +00:00
Joey Hess
45119da4de devblog 2014-07-07 16:11:10 -04:00
Joey Hess
a8e11fe1ea android version 2014-07-07 14:27:40 -04:00
Joey Hess
923b436c08 fix heights 2014-07-07 13:57:34 -04:00
Joey Hess
c415ab16f0 fix heights 2014-07-07 13:57:15 -04:00
Joey Hess
90776d8bd6 fix heights 2014-07-07 13:56:29 -04:00
Joey Hess
dfb2bce3c4 fix heights 2014-07-07 13:55:56 -04:00
Joey Hess
46b7cc3216 fix heights 2014-07-07 13:55:29 -04:00
Joey Hess
4b04bf0f71 fix heights 2014-07-07 13:54:44 -04:00
Joey Hess
a2cd37945f reorg 2014-07-07 13:53:45 -04:00
Joey Hess
6b936a638f fix 2014-07-07 13:51:29 -04:00
Joey Hess
e819c0ab29 add display of build-version files 2014-07-07 13:49:17 -04:00
Joey Hess
f0c48e8591 moreinfo 2014-07-07 13:42:46 -04:00
Joey Hess
8116d10b8f Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-07 13:31:22 -04:00
Joey Hess
da3d7a369b confirm 2014-07-07 13:31:13 -04:00
http://joeyh.name/
09ac7438d3 Added a comment 2014-07-07 17:19:03 +00:00
http://joeyh.name/
3d054deb7d Added a comment 2014-07-07 17:17:50 +00:00
Joey Hess
2b61066bed add news item for git-annex 5.20140707 2014-07-07 12:41:47 -04:00
zardoz
8037a3ad73 Added a comment 2014-07-07 14:09:33 +00:00
zardoz
27bc6d8425 2014-07-07 13:48:44 +00:00
zardoz
32a0403542 Added a comment 2014-07-07 12:48:07 +00:00
zardoz
fddbec98f5 2014-07-07 12:06:01 +00:00
Idhup
06fa3db7ee Added a comment: typo 2014-07-07 10:23:23 +00:00
Idhup
4554acd79b Added a comment: Connection sharing workaround 2014-07-07 10:20:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkNE-H4vEcbcGndxq5daT8qUb7yIf7r1OE
2e08069c96 Added a comment 2014-07-07 10:06:03 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkNE-H4vEcbcGndxq5daT8qUb7yIf7r1OE
a09b957f66 Added a comment 2014-07-07 10:05:07 +00:00
http://ypid.wordpress.com/
c9903e3ff1 Added a comment: git annex whereis --in origin 2014-07-07 09:45:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkNE-H4vEcbcGndxq5daT8qUb7yIf7r1OE
3827bdc763 Added a comment 2014-07-07 08:40:57 +00:00
http://ypid.wordpress.com/
142cb7efaa Added a comment: -A --all operate on all versions of all files 2014-07-07 07:42:03 +00:00
66.87.139.102
00cda7d582 poll vote (OpenStack SWIFT) 2014-07-07 05:44:00 +00:00
divB
0e34b68623 Added a comment 2014-07-07 01:16:21 +00:00
divB
3b210827e7 Added a comment: Also in the same boat 2014-07-07 01:12:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkNE-H4vEcbcGndxq5daT8qUb7yIf7r1OE
54316c9c3f 2014-07-06 21:18:50 +00:00
Idhup
1cdddf76f6 Added a comment: Didn't work 2014-07-06 17:46:01 +00:00
https://launchpad.net/~rorymcc
7090340273 2014-07-06 11:21:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnq-RfkVpFN15SWvQ2lpSGAi0XpNQuLxKM
ccf8faae2c Added a comment: What about safe? 2014-07-06 10:46:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnq-RfkVpFN15SWvQ2lpSGAi0XpNQuLxKM
d48ae1c063 removed 2014-07-06 10:45:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnq-RfkVpFN15SWvQ2lpSGAi0XpNQuLxKM
2540010192 Added a comment: What about safe? 2014-07-06 10:44:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnq-RfkVpFN15SWvQ2lpSGAi0XpNQuLxKM
fc1df9d717 Typo 2014-07-06 10:32:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
8a1351cea5 Added a comment 2014-07-05 22:29:01 +00:00
http://joeyh.name/
bf03ab3874 Added a comment 2014-07-05 21:55:46 +00:00
http://joeyh.name/
6cdcdea98b 2014-07-05 21:48:42 +00:00
Joey Hess
f9caf89190 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-05 17:21:55 -04:00
Joey Hess
90fff5abe0 devblogish 2014-07-05 17:21:14 -04:00
http://joeyh.name/
cd6c771715 Added a comment 2014-07-05 21:17:17 +00:00
Joey Hess
eed552609c Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-05 17:13:19 -04:00
Joey Hess
4a66cd3f91 assistant: Fix bug, introduced in last release, that caused the assistant to make many unncessary empty merge commits. 2014-07-05 17:12:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
5969ae14e5 2014-07-05 20:57:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
9d7388745e 2014-07-05 20:56:04 +00:00
http://joeyh.name/
e08ef580ed Added a comment 2014-07-05 20:34:39 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmqaNwDQ367zpW6cIRviLz6zJZZFODgoEI
0a56eb6855 2014-07-05 11:30:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnfM7ZF0Q5U9k1LljyDXH37cuXU5Gx6gtM
61a990fc19 Added a comment: fast migrate 2014-07-05 08:21:21 +00:00
EskildHustvedt
5ace35dfb9 2014-07-05 05:15:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
f973499dad Added a comment 2014-07-04 22:30:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
e38fec4f52 Added a comment 2014-07-04 22:28:27 +00:00
Joey Hess
0116ee498b
Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-04 18:12:08 -04:00
http://joeyh.name/
b5659c2a68 Added a comment 2014-07-04 22:09:38 +00:00
Joey Hess
51767d8e3b
devblog 2014-07-04 18:07:41 -04:00
Joey Hess
e0fc5bebab Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-04 18:01:02 -04:00
http://joeyh.name/
3208b70a7f Added a comment 2014-07-04 21:10:17 +00:00
http://joeyh.name/
768f236740 Added a comment 2014-07-04 20:57:54 +00:00
Joey Hess
1c036d08eb
Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-04 16:40:05 -04:00
http://joeyh.name/
0d0451fca5 Added a comment 2014-07-04 19:53:43 +00:00
http://joeyh.name/
0a1875e508 Added a comment 2014-07-04 19:38:19 +00:00
Joey Hess
a2662088e3
dup 2014-07-04 15:34:55 -04:00
Joey Hess
2622fd3192
Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-04 15:28:58 -04:00
Joey Hess
e6330988dd
Fix memory leak when committing millions of changes to the git-annex branch 
Eg after git-annex add has run on 2 million files in one go.

Slightly unhappy with the neeed to use a temp file here, but I cannot see
any other alternative (see comments on the bug report).

This commit was sponsored by Hamish Coleman.
 2014-07-04 15:28:07 -04:00
http://joeyh.name/
c85d20d02e Added a comment 2014-07-04 19:26:00 +00:00
http://joeyh.name/
4b43f4e481 Added a comment 2014-07-04 18:36:49 +00:00
http://joeyh.name/
d0dbaddb46 Added a comment 2014-07-04 18:24:51 +00:00
Joey Hess
8f67151f2a
Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-04 14:17:11 -04:00
http://joeyh.name/
7faf8b010a Added a comment 2014-07-04 18:18:41 +00:00
Joey Hess
32fc3abfdd
bug report 2014-07-04 14:15:38 -04:00
http://joeyh.name/
41bd439a2f Added a comment 2014-07-04 18:03:54 +00:00
http://joeyh.name/
e6ca67244b Added a comment 2014-07-04 17:58:10 +00:00
http://joeyh.name/
a6cc41869c Added a comment 2014-07-04 17:55:46 +00:00
http://joeyh.name/
6f2058e1e6 Added a comment 2014-07-04 17:52:41 +00:00
http://joeyh.name/
024086804b Added a comment 2014-07-04 17:52:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
15e151726a Added a comment 2014-07-04 16:25:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
6a62713b20 removed 2014-07-04 16:25:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
fff29ecc2d Added a comment 2014-07-04 16:23:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
4a1324fc85 removed 2014-07-04 16:22:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
cc46318cfd Added a comment 2014-07-04 16:21:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmM6DfQEsnM9atNrdbmj3ql9QUOALLFd2c
1f3ffcc0b0 2014-07-04 16:09:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmM6DfQEsnM9atNrdbmj3ql9QUOALLFd2c
1815e3c50c 2014-07-04 16:07:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmM6DfQEsnM9atNrdbmj3ql9QUOALLFd2c
1d7964024f 2014-07-04 16:05:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
73b16289c1 2014-07-04 15:36:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmlO6w9_FAVe3v6MdnkePxaTJqp0RPbGhM
1831b56b21 Added a comment 2014-07-04 04:00:25 +00:00
Joey Hess
3867c3d3bc Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-03 16:41:13 -04:00