Commit graph

3759 commits

Author SHA1 Message Date
Joey Hess
595d13020b updates 2012-05-31 15:25:26 -04: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
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
Joey Hess
f120dbc735 add manual cabal instuctions, I'm told the AUR may have dependency issues 2012-05-27 20:37:14 -04:00
Joey Hess
f945c5231d format 2012-05-27 20:37:14 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkaT0B6s9jQuMzQUYRVBgWqtO7BhT_ZSaE
56468d41f2 Added a comment 2012-05-27 23:35:19 +00:00
http://joeyh.name/
6de910312c Added a comment 2012-05-27 22:08:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkaT0B6s9jQuMzQUYRVBgWqtO7BhT_ZSaE
b8d36b6667 Added a comment 2012-05-27 21:42:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkaT0B6s9jQuMzQUYRVBgWqtO7BhT_ZSaE
3f5b0fc6cd removed 2012-05-27 21:42:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkaT0B6s9jQuMzQUYRVBgWqtO7BhT_ZSaE
7b09d83db2 Added a comment 2012-05-27 21:41:58 +00:00
http://joeyh.name/
dd6f92bf63 Added a comment 2012-05-27 21:33:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkaT0B6s9jQuMzQUYRVBgWqtO7BhT_ZSaE
94649c1270 Added a comment 2012-05-27 21:13:50 +00:00
Joey Hess
4127e92b3a update 2012-05-27 16:57:32 -04:00
Joey Hess
e96975eb3a update 2012-05-27 16:56:28 -04:00
Joey Hess
402b4c81ba add trail 2012-05-27 16:56:20 -04:00
http://joeyh.name/
9ccf933ffa Added a comment 2012-05-27 20:53:06 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkaT0B6s9jQuMzQUYRVBgWqtO7BhT_ZSaE
d39c0d5420 removed 2012-05-27 20:33:22 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkaT0B6s9jQuMzQUYRVBgWqtO7BhT_ZSaE
085e02012f Added a comment: cannot get files 2012-05-27 20:33:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkaT0B6s9jQuMzQUYRVBgWqtO7BhT_ZSaE
737a273ea7 Added a comment: cannot get files 2012-05-27 20:33:01 +00:00
Joey Hess
8bf2d1902b format 2012-05-26 23:47:55 -04:00
Joey Hess
697298718c update 2012-05-26 22:25:25 -04:00
Joey Hess
76720a6d0d update 2012-05-26 21:38:25 -04:00
Joey Hess
6703892e83 reord 2012-05-26 21:24:43 -04:00
Joey Hess
ec9f793db1 update 2012-05-26 21:18:27 -04:00