Commit graph

13311 commits

Author SHA1 Message Date
Joey Hess
2f57d74534 remove print 2013-08-29 20:28:45 -04:00
Joey Hess
62beaa1a86 refactor git-annex branch log filename code into central location
Having one module that knows about all the filenames used on the branch
allows working back from an arbitrary filename to enough information about
it to implement dropping dead remotes and doing other log file compacting
as part of a forget transition.
2013-08-29 19:13:00 -04:00
Joey Hess
6147652cc6 wording 2013-08-29 16:41:59 -04:00
Joey Hess
6cdac3a003 sync, assistant: Force push of the git-annex branch.
Necessary to ensure it gets pushed to remotes after being rewritten by forget.
See inline rationalles for why I think this is safe!
2013-08-29 14:27:53 -04:00
Joey Hess
c181efe437 use --force in taggedPush
This should make the assistant force update its tagged push branch
after a transition like git annex forget.
2013-08-29 13:31:29 -04:00
Joey Hess
336d5ec349 Merge branch 'master' into forget 2013-08-29 13:23:02 -04:00
Joey Hess
484daf5b39 fix pagespec 2013-08-28 17:43:18 -04:00
Joey Hess
719e6e3709 move post to other blog 2013-08-28 17:41:55 -04:00
Joey Hess
47acd6aee5 new devblog for new year of crowdfunded development 2013-08-28 17:40:09 -04:00
Joey Hess
5ff6fce61a fix 2013-08-28 17:27:39 -04:00
Joey Hess
b726ca363d Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-28 17:22:16 -04:00
Joey Hess
07a8a59dc6 blog for the day 2013-08-28 17:21:52 -04:00
Joey Hess
d3af414568 typo 2013-08-28 17:05:07 -04:00
Joey Hess
4a915cd3cd add forget command
Works, more or less. --dead is not implemented, and so far a new branch
is made, but keys no longer present anywhere are not scrubbed.

git annex sync fails to push the synced/git-annex branch after a forget,
because it's not a fast-forward of the existing synced branch. Could be
fixed by making git-annex sync use assistant-style sync branches.
2013-08-28 16:41:13 -04:00
http://joeyh.name/
09371e9915 Added a comment 2013-08-28 20:25:21 +00:00
Richard Hartmann
56df3e498c Fix own comment 2013-08-28 22:01:49 +02:00
Joey Hess
fcd5c167ef untested transition detection on merging, and transition running code 2013-08-28 15:57:42 -04:00
Joey Hess
511cf77b6d add transition log 2013-08-28 13:54:51 -04:00
http://edheil.wordpress.com/
81a42a2887 Added a comment 2013-08-28 13:54:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI8
2e19c78553 Added a comment: This is an awesome feature 2013-08-28 13:40:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawknruiCHUcOh2mmpkh7OFJ4iNfAOOamRVs
a42d871424 2013-08-28 03:51:56 +00:00
Sandra.Devil
8e04dbe528 2013-08-28 03:24:44 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
fe1ccd4a58 2013-08-28 03:22:46 +00:00
http://a-or-b.myopenid.com/
5ecdb286ac 2013-08-28 01:43:13 +00:00
http://a-or-b.myopenid.com/
7132edff6d Added a comment 2013-08-28 01:32:41 +00:00
Joey Hess
0951e20149 add news item for git-annex 4.20130827 2013-08-27 16:23:04 -04:00
Joey Hess
a597d86bb7 Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-27 16:21:52 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
d50bb5012d Added a comment 2013-08-27 20:02:23 +00:00
Joey Hess
a8d74d39c1 prep release 2013-08-27 13:31:41 -04:00
Joey Hess
458e0e0055 Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid' 2013-08-27 13:23:20 -04:00
konubinix
4f1861270c Added a comment: And with a lots of mails? 2013-08-27 06:44:56 +00:00
http://edheil.wordpress.com/
d04d9bb89e Added a comment 2013-08-27 02:27:08 +00:00
Joey Hess
c5e650ccea Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-26 22:04:47 -04:00
Joey Hess
c4fcb20d02 blog for the day 2013-08-26 22:03:37 -04:00
Joey Hess
9e8521910d Android: Fix bug in terminal app that caused it to spin using much CPU and battery. This problem was introduced in version 4.20130601. 2013-08-26 22:00:16 -04:00
http://joeyh.name/
5899439cb0 Added a comment 2013-08-27 01:46:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
d85592c80a 2013-08-26 23:00:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
93ef36d655 2013-08-26 22:57:14 +00:00
Joey Hess
d7aa28e00c fix docs re youtu.be 2013-08-26 17:53:38 -04:00
http://edheil.wordpress.com/
0f773df371 Added a comment 2013-08-26 20:49:34 +00:00
http://edheil.wordpress.com/
7b43b77196 removed 2013-08-26 20:48:25 +00:00
http://edheil.wordpress.com/
159a3c0889 removed 2013-08-26 20:47:55 +00:00
http://edheil.wordpress.com/
7d99188342 Added a comment 2013-08-26 20:19:08 +00:00
http://joeyh.name/
01e9027404 Added a comment 2013-08-26 20:16:05 +00:00
http://joeyh.name/
d84cfddff7 Added a comment: oh yeah, i can run top in adb.. 2013-08-26 20:14:13 +00:00
Joey Hess
8f131c8298 Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-26 16:09:45 -04:00
Joey Hess
ad5937a0ce thought 2013-08-26 16:03:50 -04:00
http://joeyh.name/
3071af457a Added a comment 2013-08-26 20:00:39 +00:00
http://joeyh.name/
018b871213 Added a comment 2013-08-26 19:51:48 +00:00
http://edheil.wordpress.com/
e52c5d21e6 Added a comment 2013-08-26 19:38:12 +00:00