Commit graph

14942 commits

Author SHA1 Message Date
Joey Hess
b7c15f3b60 webapp: Avoid encoding problems when displaying the daemon log file. 2013-11-07 15:29:20 -04:00
Joey Hess
09abd29469 improve docs 2013-11-07 15:22:45 -04:00
Joey Hess
9ff229a798 watcher: Avoid loop when adding a file owned by someone else fails in indirect mode because its permissions cannot be modified.
Adding the file moved it to the annex, and then tried to set the mode.
Error unwind then moved the file back, and so the watcher saw the file get
deleted and then added back, and so tried again..
2013-11-07 15:18:54 -04:00
Joey Hess
4f373503f2 sync: When there are merge conflicts that get automatically resolved, exit nonzero at the end. 2013-11-07 15:02:11 -04:00
Joey Hess
365ecb6c2d no status in bare repo 2013-11-07 14:44:44 -04:00
Joey Hess
1f17a87872 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-07 14:44:35 -04:00
Joey Hess
b1a9074c19 remove some old comments about safety of git working tree commands in direct mode 2013-11-07 14:43:34 -04:00
Joey Hess
62677d3268 update 2013-11-07 14:40:34 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n48
b879e4227b Added a comment 2013-11-07 18:40:27 +00:00
http://joeyh.name/
ffdf67efdb Added a comment 2013-11-07 18:38:23 +00:00
Joey Hess
fcf019b9ec Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-07 14:13:28 -04:00
Joey Hess
d99bdbbb84 Merge branch 'directguard' 2013-11-07 14:12:13 -04:00
http://joeyh.name/
1172a89950 Added a comment 2013-11-07 18:12:09 +00:00
Joey Hess
b4a77dba78 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-07 14:11:17 -04:00
Joey Hess
59ecc804cd add new status command
This works for both direct and indirect mode.

It may need some performance tuning.

Note that unlike git status, it only shows the status of the work tree, not
the status of the index. So only one status letter, not two .. and since
files that have been added and not yet committed do not differ between the
work tree and the index, they are not shown. Might want to add display of
the index vs the last commit eventually.

This commit was sponsored by an unknown bitcoin contributor, whose
contribution as been going up lately! ;)
2013-11-07 14:07:25 -04:00
Joey Hess
eed2ed4fdb rename status to info, and update docs 2013-11-07 12:45:59 -04:00
http://joeyh.name/
3cc637022c Added a comment 2013-11-07 16:42:15 +00:00
Joey Hess
ec2c2adb10 one more git-remote-gcrypt ref 2013-11-07 12:29:13 -04:00
http://joeyh.name/
f3cf1971da Added a comment 2013-11-07 16:01:02 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n48
5e1a5ff508 2013-11-07 11:22:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o
60cfab0e5c 2013-11-07 10:49:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o
a907b436bc 2013-11-07 10:42:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
56185d65a9 removed 2013-11-07 09:29:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
b246f78716 Added a comment: Update git-annex seems to work 2013-11-07 09:28:51 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
596d6dcffa Added a comment: OS X builds 2013-11-07 05:12:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n48
196400a8f4 Added a comment 2013-11-06 23:14:03 +00:00
http://joeyh.name/
0e7aa350aa Added a comment 2013-11-06 22:21:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n48
280a3204a2 2013-11-06 21:38:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
2c37b6ca1d Added a comment: S3 works without encryption 2013-11-06 21:09:26 +00:00
Joey Hess
b66642ebb6 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-06 16:45:48 -04:00
Joey Hess
a422eb5481 sponsor 2013-11-06 16:42:53 -04:00
Joey Hess
3090d32d98 devblog 2013-11-06 16:39:24 -04:00
Joey Hess
691850ca39 Allow optionally configuring git-annex with -fEKG to enable awesome remote monitoring interfaceat http://localhost:4242/ 2013-11-06 16:33:45 -04:00
Joey Hess
4eeebf162f adjust test suite to work with and test direct mode guard 2013-11-06 16:10:33 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
4fe4ce354a 2013-11-06 19:58:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
41ed969110 2013-11-06 19:57:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
eaeae91988 2013-11-06 19:54:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
4722fa5e7a rename bugs/GPG_errors_under_OS_10.9_Mavericks.mdwn to bugs/Mac_OS_10.9_GPG_error_adding_S3_repo.mdwn 2013-11-06 19:52:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
e1c7dd4a95 2013-11-06 19:49:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
3a26df0028 2013-11-06 19:47:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM
2946fd5ebf 2013-11-06 18:40:19 +00:00
Joey Hess
77e3f36b92 update 2013-11-06 13:08:41 -04:00
Joey Hess
b06d6b98bf update 2013-11-06 13:08:15 -04:00
Joey Hess
4f3f918abe fix merge 2013-11-06 13:03:23 -04:00
Joey Hess
00c91816fb Merge branch 'master' into directguard 2013-11-06 13:02:35 -04:00
Joey Hess
509e3bf5bb add news item for git-annex 4.20131106 2013-11-06 12:57:25 -04:00
http://joeyh.name/
2f64369444 Added a comment 2013-11-06 16:40:58 +00:00
Joey Hess
e3ade17eb0 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-06 12:39:20 -04:00
Joey Hess
81117e8a9d typo 2013-11-06 12:39:14 -04:00
http://joeyh.name/
67064c27db Added a comment 2013-11-06 16:38:48 +00:00