Commit graph

27375 commits

Author SHA1 Message Date
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
7ba836eec3
make way for git checkout output 2016-04-04 13:25:30 -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
anarcat
dfd7a491f1 2016-04-04 14:41:14 +00:00
ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626
9162c06055 Added a comment 2016-04-04 11:25:34 +00:00
ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626
df295afb72 Added a comment 2016-04-04 11:24:39 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
95b9bc033b 2016-04-04 06:24:32 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
572d2780eb Added a comment 2016-04-04 06:07:20 +00:00
szrc
f1b7f407ee Added a comment: Local storage of creds 2016-04-04 03:59:02 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
48a786902c Added a comment 2016-04-03 23:00:48 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
c271a7ad26 Added a comment 2016-04-03 22:30:59 +00:00
ExGen
ace65c6ea2 removed 2016-04-03 20:16:50 +00:00
ExGen
4411894024 removed 2016-04-03 20:16:30 +00:00
ExGen
8cc33aaf0f Added a comment: Found? 2016-04-03 20:15:02 +00:00
ExGen
62e21f63cd Added a comment: O_O 2016-04-03 19:56:01 +00:00
ExGen
a13110a6af Added a comment: O_o 2016-04-03 14:42:29 +00:00
ExGen
34f2c07d01 rename bugs/Get_failed.mdwn to bugs/Windows__58___git_annex_get_failed.mdwn 2016-04-03 14:01:06 +00:00
ExGen
4f610fad39 2016-04-03 14:00:09 +00:00
ExGen
87e4e2e4c2 Added a comment: Same 2016-04-03 13:47:26 +00:00
ExGen
6b2425d7bf Added a comment: Harlinks 2016-04-03 11:21:02 +00:00
gavinwahl@d3a94ffbd6df3b8833a53ff11ec435f58f7c44a9
9c41ad3dbc Added a comment: Shared key - how many keys? 2016-04-03 03:43:58 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
899cb2ddfc 2016-04-03 00:43:14 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
d03f445e77 Added a comment: Makes sense. 2016-04-02 23:41:23 +00:00
ExGen
730e1aee68 Added a comment: Harlinks 2016-04-02 23:32:24 +00:00
Joey Hess
c7b06b879b
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-02 16:48:03 -04:00
zarel
0522afa067 Added a comment 2016-04-02 20:22:23 +00:00
zarel
2f420e3ca9 2016-04-02 20:16:47 +00:00
tim@5431dd39464df207b7d46d3cf1bc74c82123ac68
083dd8f64e Typo 2016-04-01 21:38:42 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
6509834f3d Added a comment: cache? 2016-04-01 19:56:44 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
ce63557e23 2016-04-01 17:05:04 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
e793a32082 2016-04-01 17:04:21 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
d1621c89cc 2016-04-01 17:02:44 +00:00
Joey Hess
3125b4298b
better example 2016-04-01 10:58:21 -04:00
Joey Hess
11d76f0c8e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-31 19:07:03 -04:00
Joey Hess
92db17e16f
devblog 2016-03-31 19:06:30 -04:00
Joey Hess
ed3e8e1886
Merge branch 'adjustedbranch' 2016-03-31 19:05:47 -04: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
Kalle
78ce8fc01c Added a comment: Had what I believe to be the same issue 2016-03-31 21:22:22 +00:00
Joey Hess
f08149207c
autoinit on upgrade 2016-03-31 17:20:43 -04:00
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