Commit graph

27783 commits

Author SHA1 Message Date
Joey Hess
11935c4d6f
fix parsing of commit with no parents 2016-03-31 17:12:01 -04:00
Joey Hess
860602a1e6
made some progress on syncing adjusted branches, but still buggy 2016-03-31 14:56:10 -04:00
Don
2f239a3705 Added a comment: want everything, but not old versions 2016-03-31 18:50:56 +00:00
Joey Hess
a585731935
add reflog messages 2016-03-31 12:27:48 -04:00
Joey Hess
02ce75c87d
clean up handling of commit lock
Closing the lock manually caused a later exception when the bracket tried
to close it again.
2016-03-31 12:04:05 -04:00
Antoine Beaupré
c82d6ba99e explain a bit more 2016-03-31 10:55:20 -04:00
Antoine Beaupré
2819bab344 new script 2016-03-31 10:50:37 -04:00
anarcat
02cdd59bb6 another batch? 2016-03-31 14:08:03 +00:00
Joey Hess
93f5ccc808
update 2016-03-30 16:01:59 -04:00
Joey Hess
20c942108c
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-30 15:55:23 -04:00
Joey Hess
d72b85d437
update 2016-03-30 15:55:18 -04:00
anarcat
749e1041b3 workaround 2016-03-30 18:19:17 +00:00
anarcat
625d4bb8f1 more details 2016-03-30 18:11:30 +00:00
anarcat
7935355b7e weird info bug 2016-03-30 18:02:25 +00:00
anarcat
e250bd801b formatting fix 2016-03-30 03:22:00 +00:00
anarcat
9b7ea9aaf6 usability issue with crippled filesystems? not sure how to handle this 2016-03-30 03:21:00 +00:00
Joey Hess
f63b839763
todo 2016-03-29 18:03:02 -04:00
Joey Hess
7afc82cf1d
devblog 2016-03-29 16:47:21 -04:00
Joey Hess
4b4a3b0152
todo 2016-03-29 16:44:09 -04:00
Joey Hess
fb656b9048
log --raw-date: Use to display seconds from unix epoch. 2016-03-29 14:39:16 -04:00
Joey Hess
1d848a45d2
log: Display time with time zone.
Also cleaned up ugliness with zombies.
2016-03-29 14:27:49 -04:00
Joey Hess
6301543c00
prevent git-annex adjust changing things out from under the daemon 2016-03-29 13:57:48 -04:00
Joey Hess
8a69298bf2
init: Automatically enter the adjusted unlocked branch when in a v6 repo on a filesystem not supporting symlinks. 2016-03-29 13:54:42 -04:00
Joey Hess
bcd2350fc7
update 2016-03-29 13:30:29 -04:00
Joey Hess
42b7ccc89f
git annex add in adjusted unlocked branch
Cached the current branch lookup just because it seems unnecessary overhead
to run an extra git command per add to query the current branch.
2016-03-29 13:26:06 -04:00
Joey Hess
4226ae1040
updae 2016-03-29 12:50:25 -04:00
Joey Hess
5e1d7bbc00
limit git annex adjust to v6 mode
doesn't work in v5
2016-03-29 12:05:02 -04:00
Joey Hess
f4dd3fbb68
option parser for adjust command 2016-03-29 11:54:18 -04:00
Joey Hess
4c9ca98769
docs for git-annex adjust 2016-03-29 11:39:43 -04:00
Joey Hess
1df62b43d1
remove hashPointerFile'
no longer needed now that hashPointerFile uses a long-running git
hash-object handle
2016-03-29 11:15:21 -04:00
Joey Hess
70e8d6860e
Merge branch 'master' into adjustedbranch 2016-03-29 11:07:40 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
2fd7cc4bfe 2016-03-29 13:27:39 +00:00
Joey Hess
2ba851ff5d
OSX build updated for security fix; old obsolete builds for older versions removed as they contain vulnerable git 2016-03-28 12:51:16 -04:00
Joey Hess
53a1a38aeb
comment 2016-03-28 09:23:53 -04:00
Joey Hess
a60fbce826
comment 2016-03-28 09:21:37 -04:00
http://svario.it/gioele
891fdf7eaa 2016-03-28 09:58:25 +00:00
https://openid.stackexchange.com/user/27ceb3c5-0762-42b8-8f8a-ed21c284748f
7fc51f338c Added a comment: why not mimetypes for preferred content? 2016-03-28 08:32:45 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
f3148c4313 2016-03-27 00:58:22 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
61ad36c67d removed 2016-03-27 00:57:44 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
b476204254 2016-03-27 00:56:57 +00:00
Tobias
541ac227b7 Added a comment: History 2016-03-25 15:24:22 +00:00
185.16.53.225
74fbef73c8 poll vote (Same as for regular git-annex. ~/annex/) 2016-03-24 16:01:43 +00:00
anarcat
e16ba65caf Added a comment: git remote 2016-03-24 14:15:06 +00:00
Kalle
ecc5480828 Added a comment 2016-03-23 21:22:16 +00:00
Joey Hess
804e07f3bd
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-23 11:46:38 -04:00
Joey Hess
589ff4ebbb
changelog 2016-03-23 11:42:49 -04:00
Robie Basak
7948110134
ddar remote: fix ssh calls
sshOptions is now designed for working out ssh options only, and may
insert the extra options it is given to the middle. So it is incorrect
to call it with the remote parameters at the end. Instead, append them
to its return value.

This half regressed in 5be7ba7, and presumably regressed fully when
sshOptions was changed some time later.
2016-03-23 11:42:26 -04:00
b@526b37d9a821b5f9ce4e48014422239233ded155
309e16fc36 Added a comment: Fetch files from two (or more) remotes simultaneously? 2016-03-21 22:47:43 +00:00
Tobias
0266c28614 Added a comment: bare repository in direct mode 2016-03-21 21:28:57 +00:00
Kalle
55315a3a58 Added a comment: Different solution 2016-03-21 21:02:58 +00:00