Joey Hess
44402159dd
add ok's
2012-12-13 16:02:10 -04:00
Joey Hess
2cfda59174
reorder for better display
2012-12-13 15:58:38 -04:00
Joey Hess
7303774735
Merge branch 'master' of ssh://git-annex.branchable.com
2012-12-13 15:49:14 -04:00
Joey Hess
7a08220ee9
typo
2012-12-13 15:48:32 -04:00
Joey Hess
5df3c66a85
added direct and indirect commands
2012-12-13 15:44:56 -04:00
Joey Hess
cf129c2545
show direct/indirect mode
2012-12-13 13:48:07 -04:00
Joey Hess
fafb808cc3
respond
2012-12-13 13:29:38 -04:00
http://joeyh.name/
7f52ffc643
Added a comment
2012-12-13 17:03:08 +00:00
http://christian.amsuess.com/chrysn
f318bccbeb
no annex-rsync-options = -e 'ssh -p 2234'
2012-12-13 16:47:52 +00:00
Joey Hess
f807e60d9b
todo: support pairing with multiple distinct repos
2012-12-13 12:34:39 -04:00
Joey Hess
dd032bd84c
furnish git with an (empty) template directory in standalone builds
...
This will stop git-init complaining about missing template directory.
2012-12-13 12:27:32 -04:00
Joey Hess
9b663c7f8c
remove libSystem.b from OSX build
...
Without the frameworks, but with this library, I get:
dyld: Symbol not found: __vproc_transactions_enable
Referenced from: /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
Expected in: /Volumes/git-annex/git-annex.app/Contents/MacOS/./C
in /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
Without this library, things seem to work again w/o frameworks.
2012-12-13 12:17:12 -04:00
Joey Hess
cfe354eccd
whitespace fix
2012-12-13 00:46:30 -04:00
Joey Hess
ffdd08fd2e
Merge branch 'master' into desymlink
2012-12-13 00:46:10 -04:00
Joey Hess
0d50a6105b
whitespace fixes
2012-12-13 00:45:27 -04:00
Joey Hess
b080a58b76
Merge branch 'master' into desymlink
...
Conflicts:
Annex/CatFile.hs
Annex/Content.hs
Git/LsFiles.hs
Git/LsTree.hs
2012-12-13 00:29:06 -04:00
Joey Hess
f87a781aa6
finished where indentation changes
2012-12-13 00:24:19 -04:00
Joey Hess
b77290cecc
Merge branch 'master' of ssh://git-annex.branchable.com
2012-12-12 21:37:18 -04:00
Joey Hess
900351ab85
try skipping OSX frameworks
2012-12-12 21:34:59 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkfHTPsiAcHEEN7Xl7WxiZmYq-vX7azxFY
7d67deed89
Added a comment
2012-12-13 01:04:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkfHTPsiAcHEEN7Xl7WxiZmYq-vX7azxFY
41cd30cb4a
Added a comment: OS/X build 2012-12-12
2012-12-13 00:59:52 +00:00
http://joeyh.name/
fa9cead9dd
Added a comment
2012-12-12 23:45:42 +00:00
Joey Hess
5b1fd7a01d
Merge branch 'master' of ssh://git-annex.branchable.com
2012-12-12 19:41:14 -04:00
Joey Hess
5d6b0bb086
blog for the day
2012-12-12 19:38:53 -04:00
Joey Hess
d4bd8fdd63
update
2012-12-12 19:31:31 -04:00
Joey Hess
e7b8cb0063
direct mode committing
2012-12-12 19:20:38 -04:00
http://grossmeier.net/
35e4b85218
2012-12-12 20:17:43 +00:00
Joey Hess
bfb446604a
starting a page about direct mode
2012-12-12 15:36:00 -04:00
Joey Hess
b0c5cbfde2
add notStaged
2012-12-12 13:25:26 -04:00
Joey Hess
e8a74e9493
where indentation
2012-12-12 13:20:58 -04:00
Joey Hess
0714b0bd03
remove unused function
2012-12-12 13:17:41 -04:00
Joey Hess
f2ed0f9659
fix associated files to not fall back to object location
2012-12-12 13:11:59 -04:00
Joey Hess
676c78436d
also update direct mode associated files in local merge
2012-12-12 13:06:03 -04:00
Joey Hess
752b5354ab
make parent directory
2012-12-12 13:05:50 -04:00
Joey Hess
1c7f7ef46b
Merge branch 'master' of ssh://git-annex.branchable.com
2012-12-12 12:04:38 -04:00
Joey Hess
0fdfab366e
put sbin directories in PATH when building standalone so lsof is found
...
This ensures that the standalone builds will include lsof, and it'll then
be in the runshell PATH, so will work.
This does not deal with manual builds where lsof is not in path, which
will fail at runtime due to the program being missing.
2012-12-12 12:02:54 -04:00
http://lj.rossia.org/users/imz/
3ff783b207
Added a comment: "removing" vs drop
2012-12-12 13:20:42 +00:00
http://edheil.wordpress.com/
739c937e63
2012-12-11 20:45:13 +00:00
Joey Hess
08af051238
remove set -e
...
Not sure why this is failing w/o an error message.
2012-12-11 14:07:06 -04:00
Joey Hess
20d195ff20
reorg
2012-12-11 13:26:28 -04:00
Joey Hess
8453a08949
add news item for git-annex 3.20121211
2012-12-11 12:29:25 -04:00
Joey Hess
18d637d71d
adjust version
2012-12-11 12:28:50 -04:00
Joey Hess
c0bf569417
releasing version 3.20121211
2012-12-11 12:28:23 -04:00
Joey Hess
dd299ce8d3
minor reorg
2012-12-11 12:22:33 -04:00
Joey Hess
adac96aa0d
Merge branch 'master' of ssh://git-annex.branchable.com
2012-12-11 12:17:36 -04:00
Joey Hess
644f8bfbb9
switch back to WITH_DNS
...
This is because host is not included in the standalone builds.
2012-12-11 12:14:48 -04:00
http://edheil.wordpress.com/
a3a7b17674
Added a comment
2012-12-11 16:03:04 +00:00
Joey Hess
85991ac73f
Merge branch 'master' of ssh://git-annex.branchable.com
2012-12-11 11:24:52 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
e3dc1da8f6
Added a comment
2012-12-11 08:29:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkk3K0AUduAybbBO_LRRGKOe2zcGeezbzI
f578a4f7ae
Added a comment
2012-12-11 04:15:49 +00:00