Commit graph

2142 commits

Author SHA1 Message Date
Joey Hess
2b0e65a0ad Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-04 18:17:43 -04:00
Joey Hess
b51520b0d5 update 2012-06-04 18:16:18 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlu7K3h7Ry1uDAU_ERYGuqt0LoGNJqGuRo
88107724d7 Added a comment 2012-06-04 21:01:52 +00:00
Joey Hess
e43e513414 typo 2012-06-04 16:16:50 -04:00
Joey Hess
52e31dbd89 Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-04 16:16:49 -04:00
http://joeyh.name/
fc66d64205 Added a comment 2012-06-04 20:02:23 +00:00
http://joeyh.name/
04ddceece0 Added a comment 2012-06-04 19:56:05 +00:00
http://joeyh.name/
db2e6c8239 Added a comment: This is not an easy question to answer... 2012-06-04 19:49:46 +00:00
Joey Hess
39fb9db043 add 2012-06-04 15:47:19 -04:00
http://joeyh.name/
02dce20325 Added a comment 2012-06-04 19:46:04 +00:00
http://joeyh.name/
ecac13a113 Added a comment 2012-06-04 19:45:00 +00:00
Joey Hess
c9d3a238cf Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-04 15:42:48 -04:00
Joey Hess
d08274a941 move 2012-06-04 15:42:26 -04:00
http://ciffer.net/~svend/
dfb3182877 Added a comment 2012-06-04 19:42:08 +00:00
http://ciffer.net/~svend/
e33f6bdfde removed 2012-06-04 19:40:57 +00:00
Joey Hess
0c6ccb9f90 Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-04 15:40:36 -04:00
Joey Hess
0accc932cb update 2012-06-04 15:40:11 -04:00
http://ciffer.net/~svend/
2b269f32a1 Added a comment 2012-06-04 19:40:08 +00:00
Joey Hess
9b40cd7461 update 2012-06-04 15:23:56 -04:00
Joey Hess
9791d1dfe7 update; worked on watch branch today 2012-06-04 15:16:59 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ
bc99cf6a5a 2012-06-04 17:28:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
759b55a674 nothing too crazy, but it's the usual distro specific problems or architecture specific problems 2012-06-04 09:21:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlu7K3h7Ry1uDAU_ERYGuqt0LoGNJqGuRo
2a75bbdaa0 Added a forum post asking how to make locally cached files stay up to date across both rename and modify. 2012-06-04 03:41:57 +00:00
Joey Hess
619d765646 simplify OSX installation instructions
The new Haskell Platform was released today, with the new ghc git-annex's
master branch needs, so cabal should be usable again on OSX.
2012-06-03 15:12:31 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
0064fc0beb Added a comment 2012-06-02 12:06:38 +00:00
http://joeyh.name/
f74c287e7e Added a comment 2012-06-01 17:24:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnHrjHxJAm39x8DR4bnbazQO6H0nMNuY9c
be45ac2fa0 Added a comment: sha256 2012-06-01 16:13:06 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnHrjHxJAm39x8DR4bnbazQO6H0nMNuY9c
ca755617d6 removed 2012-06-01 16:10:17 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnHrjHxJAm39x8DR4bnbazQO6H0nMNuY9c
3812e67a05 Added a comment: sha256 ? 2012-06-01 16:05:06 +00: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
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
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
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