Joey Hess
0bea8a4c55
reinject: Allow to be used in direct mode.
2013-11-26 16:15:49 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnR6E5iUghMWdUGlbA9CCs8DKaoigMjJXw
f3d7f4337a
Added a comment
2013-11-26 09:26:54 +00:00
Richard Hartmann
be43bb8f70
doc: perl -p -i -e s/certianly/certainly/
2013-11-25 21:40:19 +01:00
Joey Hess
95221c7252
fixed
2013-11-25 16:20:56 -04:00
Joey Hess
87c75417ac
OSX upgrades seem to be working now
2013-11-25 14:06:34 -04:00
http://joeyh.name/
d5c2bad48b
Added a comment
2013-11-23 19:03:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmicVKRM8vJX4wPuAwlLEoS2cjmFXQkjkE
97cc68be2a
2013-11-23 17:09:10 +00:00
Joey Hess
ad653e49cf
add
2013-11-22 19:24:12 -04:00
http://joeyh.name/
16e7951d43
Added a comment
2013-11-22 16:58:51 +00:00
Joey Hess
0d7dd05bfd
move
2013-11-22 12:52:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm5Z8wzidsumLYQnHdrVxpCx8vsd9llSlg
2270dc977e
Added a comment
2013-11-22 15:52:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo
3e3e5e42d1
2013-11-20 06:45:08 +00:00
GLITTAH
edb50f786d
Added a comment
2013-11-19 18:15:15 +00:00
Joey Hess
423e933800
respond
2013-11-19 13:48:31 -04:00
GLITTAH
b24b76006e
2013-11-19 02:56:32 +00:00
http://joeyh.name/
24d30acdc4
Added a comment
2013-11-15 20:51:18 +00:00
Joey Hess
3eeb721a90
combine bugs
2013-11-15 16:42:20 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk_Di-Ww6ffK-SCHQmIewEO_CdNjVXX17E
d47abf7c9f
fix typo
2013-11-15 18:57:29 +00:00
gueux
36e41c7625
2013-11-15 15:12:28 +00:00
gueux
55282738bb
rename todo/Check_if_an_upgrade_is_available_in_webapp.mdwn to todo/Check_if_an_upgrade_is_available_in_the_webapp.mdwn
2013-11-15 13:29:32 +00:00
gueux
742343b696
2013-11-15 13:28:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn1QhtPvsRBV7pfaDW_ZTPFv_ZIxSzQ8Rg
3953484cec
Added a comment
2013-11-13 20:41:52 +00:00
Joey Hess
f30300e877
work around for windows watcher cabal build problem
2013-11-12 21:23:20 -04:00
Joey Hess
9a58de553c
remove -Assistant from windows build flag
2013-11-12 17:39:11 -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
d99bdbbb84
Merge branch 'directguard'
2013-11-07 14:12:13 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n48
5e1a5ff508
2013-11-07 11:22:50 +00:00
Joey Hess
00c91816fb
Merge branch 'master' into directguard
2013-11-06 13:02:35 -04:00
Joey Hess
3802f2f270
work around lack of receive.denyCurrentBranch in direct mode
...
Now that direct mode sets core.bare=true, git's normal prohibition about
pushing into the currently checked out branch doesn't work.
A simple fix for this would be an update hook which blocks the pushes..
but git hooks must be executable, and git-annex needs to be usable on eg,
FAT, which lacks x bits.
Instead, enabling direct mode switches the branch (eg master) to a special
purpose branch (eg annex/direct/master). This branch is not pushed when
syncing; instead any changes that git annex sync commits get written to
master, and it's pushed (along with synced/master) to the remote.
Note that initialization has been changed to always call setDirect,
even if it's just setDirect False for indirect mode. This is needed because
if the user has just cloned a direct mode repo, that nothing has synced
with before, it may have no master branch, and only a annex/direct/master.
Resulting in that branch being checked out locally too. Calling setDirect False
for indirect mode moves back out of this branch, to a new master branch,
and ensures that a manual "git push" doesn't push changes directly to
the annex/direct/master of the remote. (It's possible that the user
makes a commit w/o using git-annex and pushes it, but nothing I can do
about that really.)
This commit was sponsored by Jonathan Harrington.
2013-11-05 21:08:31 -04:00
https://www.google.com/accounts/o8/id?id=AItOawne_amN4fko4p5cRY_9EYwaYuJKNn7LRio
8efdc1a067
Added a comment: feedback
2013-11-05 21:23:12 +00:00
Joey Hess
4510819215
v5 for direct mode, with automatic upgrade
...
This includes storing the current state of the HEAD ref, which git annex
sync is going to need, but does not make sync use it.
2013-11-05 17:05:03 -04:00
http://joeyh.name/
27e940a3f9
Added a comment
2013-11-05 16:46:28 +00:00
Joey Hess
2e3b4469e3
Merge branch 'master' of ssh://git-annex.branchable.com
2013-11-04 17:32:03 -04:00
Joey Hess
78449ed2ae
devblog
2013-11-04 17:30:53 -04:00
https://www.google.com/accounts/o8/id?id=AItOawne_amN4fko4p5cRY_9EYwaYuJKNn7LRio
33e8e85bb4
2013-11-04 20:40:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
e8641876a2
2013-11-04 11:55:35 +00:00
Joey Hess
230409441c
Merge branch 'master' of ssh://git-annex.branchable.com
2013-11-02 21:07:32 -04:00
Joey Hess
c2b979c550
respond
2013-11-02 20:48:41 -04:00
http://joeyh.name/
7c85dd6768
Added a comment
2013-11-03 00:19:35 +00:00
Joey Hess
e1a24974f1
Merge branch 'master' of ssh://git-annex.branchable.com
2013-11-02 20:16:11 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
fcc68d3e32
Added a comment
2013-11-02 23:59:16 +00:00
http://joeyh.name/
5bb89b28eb
Added a comment
2013-11-02 23:45:39 +00:00
Joey Hess
1de5eb4c81
respond
2013-11-02 19:44:03 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
081ce0b4f7
2013-11-02 23:14:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
f3cc842390
2013-11-02 23:12:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
26ff2f95e9
2013-11-02 23:05:33 +00:00
Joey Hess
768c323e74
add
2013-11-02 16:48:37 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnWwEEA3CurHkBjIYaJsJzFc4jtY2SCkrQ
c4e7b2a4d4
Added a comment
2013-10-29 00:29:03 +00:00
Joey Hess
230bfa9688
add --want-get and --want-drop options
...
New --want-get and --want-drop options which can be used to test preferred
content settings. For example, "git annex find --in . --want-drop"
2013-10-28 14:50:17 -04:00
http://joeyh.name/
66c094a251
Added a comment
2013-10-28 17:11:05 +00:00
