Commit graph

2703 commits

Author SHA1 Message Date
Joey Hess
f3f6dfcf35
New url for git-remote-gcrypt, now maintained by spwhitton. 2016-07-05 11:30:58 -04:00
anarcat
274b7a9f6c link to the adjust manpage 2016-06-23 14:39:49 +00:00
Yaroslav Halchenko
64e844e1fe
minor typo fixes throughout
problematic
flexibility
2016-06-02 11:22:18 -04:00
Joey Hess
7afa487eaa
add todo item 2016-05-23 18:13:03 -04:00
Joey Hess
33c00ab407
reply 2016-05-23 15:45:56 -04:00
Joey Hess
3dd69f932d
note commands which do not get a reply 2016-05-23 15:45:47 -04:00
Joey Hess
d4bfb9bcd9
note version for recently added command 2016-05-23 15:03:05 -04:00
xloem
f33d3b1d01 Added a comment: Retrieval progress message helpers 2016-05-20 19:42:24 +00:00
Joey Hess
eda5d9cc74
adjust: Add --fix adjustment, which is useful when the git directory is in a nonstandard place. 2016-05-16 17:18:33 -04:00
thowz
e735938bbd Added a comment: adjusting symlink paths 2016-05-13 22:32:33 +00:00
Joey Hess
ea0d2ac3b9
devblog 2016-05-04 14:39:53 -04:00
Joey Hess
3b7713b493
use DIRHASH-LOWER for consistency 2016-05-03 14:10:11 -04:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
235212655d Added a comment 2016-05-03 18:02:03 +00:00
Joey Hess
4b9ddb9429
Added DIRHASH_LOWER to external special remote protocol. 2016-05-03 13:36:59 -04:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
3f2f0aa667 Added a comment 2016-05-03 06:25:03 +00:00
Joey Hess
e8a7fcc868
clarify tha DIRHASH returns mixed case
Maybe not the best thing that it does, but it can't really be changed w/o
breaking existing remotes.
2016-04-25 13:36:13 -04:00
2a03:4980:13:4d00:21e:64ff:fe1c:1b1a
df3b6800c2 poll vote (Tahoe-LAFS) 2016-04-23 12:19:02 +00:00
2a03:4980:13:4d00:21e:64ff:fe1c:1b1a
11830277af poll vote (My phone (or MP3 player)) 2016-04-23 12:18:55 +00:00
Joey Hess
70016c8dc2
comment 2016-04-20 14:24:26 -04:00
https://tylercipriani.com/
48de59b580 poll vote (Tahoe-LAFS) 2016-04-18 17:49:35 +00:00
8.44.144.24
75114b0184 poll vote (OpenStack SWIFT) 2016-04-18 17:47:48 +00:00
Joey Hess
fdb6839cf7
update 2016-04-12 14:28:38 -04:00
Joey Hess
7d28110c68
fix master push overwrite race when updating adjusted branch, by maintaining basis ref 2016-04-09 14:12:25 -04:00
Joey Hess
cf06dac2b8
hard links on windows
* annex.thin and annex.hardlink are now supported on Windows.
* unannex --fast now makes hard links on Windows.
2016-04-08 15:25:32 -04:00
Joey Hess
251405eca2
avoid withWorkTreeRelated affecting annex symlink calculation 2016-04-08 14:24:00 -04:00
Joey Hess
64de6dcc74
one little bug.. 2016-04-06 19:23:32 -04:00
Joey Hess
60bdffe43e
fix auto merge conflict resolution when doing out of tree merge for adjusted branch 2016-04-06 17:32:04 -04:00
Joey Hess
b9e4e2ba84
new method for merging changes into adjusted branch that avoids unncessary merge conflicts
Still needs work when there are actual merge conflicts.
2016-04-06 15:36:18 -04:00
szrc
08897ff3a2 Added a comment 2016-04-05 01:18:53 +00:00
Joey Hess
20d15f70dd
response 2016-04-04 16:21:30 -04:00
Joey Hess
eeb74958a3
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-04 15:44:16 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
953d3accdc Clarified CHECKURL-MULTI syntax 2016-04-04 19:00:04 +00:00
Joey Hess
f78cbd9f0d
todo 2016-04-04 14:38:29 -04:00
Joey Hess
1720f9f851
still bug with sync in adjusted branch 2016-04-04 13:55:15 -04:00
Joey Hess
7c7f3a0f76
deal with cloning a repo that has an ajdusted branch checked out 2016-04-04 13:51:42 -04:00
Joey Hess
83ac453bc4
update 2016-04-04 13:26:33 -04:00
Joey Hess
17d71ded79
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-04 13:17:46 -04:00
Joey Hess
c3e0859846
Upgrading a direct mode repository to v6 has changed to enter an adjusted unlocked branch.
This makes the direct mode to v6 upgrade able to be performed in one clone
of a repository without affecting other clones, which can continue using v5
and direct mode.
2016-04-04 13:17:24 -04:00
szrc
f1b7f407ee Added a comment: Local storage of creds 2016-04-04 03:59:02 +00:00
Joey Hess
b7d7cc858e
remove old bug
I just fixed this one today; it was not the problem I thought it was.
2016-03-31 18:56:30 -04:00
Joey Hess
12ddb6e8b2
fixed merging of changes from adjusted branch + a remote 2016-03-31 18:54:35 -04:00
Joey Hess
860602a1e6
made some progress on syncing adjusted branches, but still buggy 2016-03-31 14:56:10 -04:00
Joey Hess
f63b839763
todo 2016-03-29 18:03:02 -04:00
Joey Hess
4b4a3b0152
todo 2016-03-29 16:44:09 -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
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
70e8d6860e
Merge branch 'master' into adjustedbranch 2016-03-29 11:07:40 -04:00
185.16.53.225
74fbef73c8 poll vote (Same as for regular git-annex. ~/annex/) 2016-03-24 16:01:43 +00:00