Joey Hess
6895a6e4fd
Merge branch 'master' into ghc7.0
2012-05-31 23:33:41 -04:00
Joey Hess
665c0fbdaa
check at configure time for sha commands in Mac OSX location
2012-05-31 23:33:07 -04:00
Joey Hess
2183fd2abd
Require that the SHA256 backend can be used when building, since it's the default.
2012-05-31 23:15:40 -04:00
Joey Hess
f5de183c71
sha256sum not so optional
2012-05-31 21:51:42 -04:00
Joey Hess
1f951de014
add a nice one
2012-05-31 21:31:25 -04:00
Joey Hess
256636c6b4
Merge branch 'master' into ghc7.0
2012-05-31 21:05:40 -04:00
Joey Hess
6fd83851c1
Fix display of warning message when encountering a file that uses an unsupported backend.
2012-05-31 21:03:24 -04:00
Joey Hess
d4a95faeb2
Merge branch 'master' of ssh://git-annex.branchable.com
2012-05-31 19:50:46 -04:00
Joey Hess
3a10095d40
import: New subcommand, pulls files from a directory outside the annex and adds them
...
Use case for this was developed somewhere on the Transiberian Railroad.
2012-05-31 19:47:18 -04:00
Joey Hess
3b09281b44
add dirContentsRecursive
2012-05-31 19:25:33 -04:00
josh
c47b1ecda0
Discussion of NTFS symlinks, junction points, and reparse points.
2012-05-31 20:11:43 +00:00
josh
233d402075
Fix typo.
2012-05-31 20:03:02 +00:00
josh
263ee1d067
Add explanation of how git on Windows handles symlinks.
2012-05-31 20:02:48 +00:00
Joey Hess
2941d30bda
update
2012-05-31 15:48:26 -04:00
Joey Hess
8a0a07ab10
Merge branch 'master' of ssh://git-annex.branchable.com
2012-05-31 15:30:30 -04:00
Joey Hess
6ea9a88ede
update
2012-05-31 15:28:04 -04:00
Joey Hess
595d13020b
updates
2012-05-31 15:25:26 -04:00
http://joeyh.name/
cbace05372
removed
2012-05-31 17:01:51 +00:00
http://joeyh.name/
9c72d42cf4
Added a comment
2012-05-31 17:01:37 +00:00
http://joeyh.name/
4f3b83d330
Added a comment
2012-05-31 17:00:59 +00:00
http://dlaxalde.myopenid.com/
8c75989338
Added a comment
2012-05-31 14:36:33 +00:00
Joey Hess
29b43cfa39
pairing
2012-05-30 20:50:53 -04:00
Joey Hess
7c962e76b4
Merge remote-tracking branch 'origin/master'
2012-05-30 17:06:48 -04:00
Joey Hess
65977a5584
lock: Reset unlocked file to index, rather than to branch head.
...
Resetting an unlocked file to the branch head failed if it had just been
added, not committed, and unlocked, since the branch didbn't have it.
The code was concerned about dropping any changes that might be staged in the
index, but I cannot see why.
2012-05-30 17:01:22 -04:00
http://joeyh.name/
bdb3c57393
Added a comment
2012-05-30 00:54:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlBSuP2uCSUr5ONRVoyL7jg0ZhBc5us_w0
1209972509
smudge broken link
2012-05-30 00:51:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY
2a61c5f286
Added a comment
2012-05-30 00:40:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY
2150b87906
2012-05-30 00:27:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY
66d885aabc
Added a comment
2012-05-30 00:26:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY
8cca7616ae
2012-05-30 00:25:22 +00:00
Joey Hess
96f00bafd0
Merge branch 'master' of ssh://git-annex.branchable.com
2012-05-29 19:21:07 -04:00
Joey Hess
0fcbf22ed6
updates
2012-05-29 19:17:38 -04:00
http://joeyh.name/
bb393ea24a
Added a comment
2012-05-29 19:10:46 +00:00
http://joeyh.name/
5c82bcf886
Added a comment
2012-05-29 19:10:42 +00:00
http://joeyh.name/
f9b24d1a47
Added a comment
2012-05-29 19:09:50 +00:00
Joey Hess
f97009fffe
correct S3 environment variable names
2012-05-29 15:01:36 -04:00
Joey Hess
a8ab3c6123
Merge branch 'master' of ssh://git-annex.branchable.com
2012-05-29 13:43:29 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY
21ca84cebf
2012-05-29 13:23:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY
f1bcd7c218
Added a comment: environment variables
2012-05-29 12:40:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY
a1195e92a3
Added a comment: ANNEX_S3 vs AWS for keys
2012-05-29 12:24:27 +00:00
Joey Hess
4ad541b1c8
note
2012-05-28 18:25:54 -04:00
Joey Hess
5de81dd2d1
Merge branch 'master' into ghc7.0
2012-05-28 15:09:42 -04:00
Joey Hess
71c3196356
update OSX instructions to use ghc7.0 branch
...
Needed until the next Haskell Platform provides a new ghc.
2012-05-28 15:07:32 -04:00
Joey Hess
8139731708
update
2012-05-28 14:47:16 -04:00
Joey Hess
98adee4369
typos
2012-05-28 14:43:27 -04:00
Joey Hess
a5da677b9e
update
2012-05-28 14:41:23 -04:00
Joey Hess
5d178d2aca
reorg
2012-05-28 14:29:21 -04:00
Joey Hess
5a270415ef
update
2012-05-28 14:26:06 -04:00
https://launchpad.net/~gdr-go2
7a505a807b
Added a comment: FAT symlinks
2012-05-28 18:12:49 +00:00
Joey Hess
6e213d04f1
sync: Show a nicer message if a user tries to sync to a special remote.
2012-05-27 20:55:56 -04:00
