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

20568 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joey Hess
909f04aee2 metadata 2014-07-14 16:53:21 -04:00
Joey Hess
e6b824a8b1 fix missing display of modal body when generating gpg key 2014-07-14 16:41:05 -04:00
http://joeyh.name/
22c4f35961 Added a comment 2014-07-14 20:20:28 +00:00
http://joeyh.name/
4377c1fc88 Added a comment 2014-07-14 20:15:07 +00:00
Joey Hess
6ce2290326 belated thanks to Kevin McKenzie for hosting the OSX autobuilder 
was previously thanked on thanks page.
 2014-07-14 16:07:35 -04:00
http://joeyh.name/
3f755d8666 Added a comment 2014-07-14 20:06:04 +00:00
Joey Hess
27d5eaa0cb Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-14 16:02:58 -04:00
Joey Hess
3e4cb0e7f9 fix windows build 2014-07-14 15:55:48 -04:00
Joey Hess
339a3b8ab0 Windows: Fix locking issue that prevented the webapp starting (since 5.20140707). 
Reversion introduced in 9fb8038166.
The locking code was wrong; the webapp re-ran itself, saw pid was locked,
and so didn't start!
 2014-07-14 15:52:00 -04:00
zardoz
f6fc066ddb Added a comment 2014-07-14 19:34:31 +00:00
http://joeyh.name/
be2751b32a Added a comment 2014-07-14 19:05:33 +00:00
http://joeyh.name/
538823f509 Added a comment 2014-07-14 18:47:21 +00:00
Joey Hess
2416ed18c4 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-14 14:37:48 -04:00
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
Joey Hess
452ea0ff91 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-14 13:40:09 -04:00
Joey Hess
810bc10857 include feed url in repeated problems message 2014-07-14 13:07:13 -04: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
Joey Hess
e36439d4fe deal with process-1.2.0.0 throwing an exception when program DNE (may only fix the tip of the iceberg) 
Configure crashed on systems with that process and without eg, sha256sum.

The rest of the code in configure looks to work ok, since it uses sh -c to
probe for commands, and sh is always in path so it works.

Dunno about all the rest of git-annex. Not a huge amount of external
program use, other than git, so perhaps this won't be a large pain.

Note that boolSystem can throw an exception now if the program doesn't
exist. Could easily be changed back to False.
 2014-07-13 22:33:28 -04:00
Joey Hess
3a7ae6f144 indentation 2014-07-13 22:33:27 -04: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
Joey Hess
542a8288a8 fix build with path-pieces-0.1.4 2014-07-13 19:24:38 -04:00
Joey Hess
d4b6458efd bug closure 2014-07-13 19:22:41 -04: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
822f4619ae resolvemerge: finish up by committing 2014-07-11 16:59:49 -04:00
Joey Hess
61a35de433 Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. 
I think this is a git behavior change, but have not checked to be sure.
Conflict cruft used to look like $foo~HEAD, but now just $foo is left
behind as conflict cruft.

With test case.
 2014-07-11 16:56:19 -04:00