summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAge
* Merge branch 'master' into xmppGravatar Joey Hess2012-10-26
|\ | | | | | | | | Conflicts: Assistant/Threads/NetWatcher.hs
| * Added a comment: Neat ideaGravatar http://joeyh.name/2012-10-26
| |
| * linkGravatar Joey Hess2012-10-26
| |
| * signGravatar Joey Hess2012-10-26
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-10-26
| |\
| * | blog for the dayGravatar Joey Hess2012-10-26
| | |
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlFUH5H4OUj9vMJIoXQs8bheiptgANQ6fU2012-10-26
| | |
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo2012-10-26
| | |
* | | Merge branch 'master' into xmppGravatar Joey Hess2012-10-26
|\| | | | | | | | | | | | | | | | | Conflicts: Assistant/Threads/MountWatcher.hs Assistant/Threads/NetWatcher.hs
| | * Added a commentGravatar http://joeyh.name/2012-10-25
| |/
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-10-25
| |\
| * | Use USER and HOME environment when set, and only fall back to getpwent, ↵Gravatar Joey Hess2012-10-25
| | | | | | | | | | | | which doesn't work with LDAP or NIS.
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo2012-10-25
| |/
| * correctionGravatar Joey Hess2012-10-25
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-10-25
| |\
| * | blog for the dayGravatar Joey Hess2012-10-25
| | |
| | * Added a comment: ok, that worked.Gravatar ka72012-10-25
| | |
| | * Added a commentGravatar http://joeyh.name/2012-10-25
| | |
* | | Merge branch 'master' into xmppGravatar Joey Hess2012-10-25
|\| |
| * | todoGravatar Joey Hess2012-10-25
| |/
* | only use one push attributeGravatar Joey Hess2012-10-25
| | | | | | | | | | When pushing to multiple UUIDs, combine them all into a single push attribute.
* | Merge remote-tracking branch 'origin/master' into xmppGravatar Joey Hess2012-10-25
|\| | | | | | | | | Conflicts: doc/design/assistant/cloud.mdwn
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo2012-10-25
| |
| * explain relationship of pairing to git remotesGravatar http://adamspiers.myopenid.com/2012-10-25
| |
| * Mark up the link so that someone interested can follow it.Gravatar http://lj.rossia.org/users/imz/2012-10-25
| |
| * poll vote (Google Drive)Gravatar 137.132.250.132012-10-25
| |
| * configure: Check that checksum programs produce correct checksums. + bitter rantGravatar Joey Hess2012-10-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | So, it might be called sha1sum, or on some other OS, it might be called sha1. It might be hidden away off of PATH on that OS. That's just expected insanity; UNIX has been this way since 1980's. And these days, nobody even gives the flying flip about standards that we briefly did in the 90's after the first round of unix wars. But it's the 2010's now, and we've certainly learned something. So, let's make it so sometimes sha1 is a crazy program that wants to run as root so it can lock memory while prompting for a passphrase, and outputting binary garbage. Yes, that'd be wise. Let's package that in major Linux distros, too, so users can stumble over it.
| * Added a commentGravatar http://joeyh.name/2012-10-25
| |
| * Added a comment: it's a git repository...Gravatar http://joeyh.name/2012-10-25
| |
| * (no commit message)Gravatar Steve2012-10-25
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-10-24
| |\
| * | add xmpp pageGravatar Joey Hess2012-10-24
| | |
| | * Added a comment: no need to mergeGravatar Steve2012-10-24
| | |
| | * Added a comment: web and hook special remotesGravatar Steve2012-10-24
| | |
| | * Added a comment: git checkoutGravatar http://ciffer.net/~svend/2012-10-24
| | |
| | * Added a commentGravatar http://joeyh.name/2012-10-24
| | |
| | * Added a comment: It works!Gravatar http://www.openid.albertlash.com/openid/2012-10-24
| | |
| | * (no commit message)Gravatar ka72012-10-24
| | |
| | * (no commit message)Gravatar ka72012-10-24
| |/
* | pull from one of the remotes in a push notificationGravatar Joey Hess2012-10-24
| | | | | | | | | | Still need to do something about transfer queueing, however. This could be a real can of worms.
* | Merge branch 'master' into xmppGravatar Joey Hess2012-10-24
|\|
| * blog for the dayGravatar Joey Hess2012-10-24
| |
* | Merge branch 'master' into xmppGravatar Joey Hess2012-10-24
|\ \
| | * poll vote (Google Drive)Gravatar 93.220.117.1412012-10-24
| | |
| | * (no commit message)Gravatar http://www.openid.albertlash.com/openid/2012-10-24
| | |
| | * Added a commentGravatar http://joeyh.name/2012-10-24
| |/
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-10-24
| |\
| * | simplifyGravatar Joey Hess2012-10-24
| | |
| | * Added a comment: What to do?Gravatar http://www.openid.albertlash.com/openid/2012-10-24
| |/
| * think I had the tagged right the 1st timeGravatar Joey Hess2012-10-24
| |