diff options
author | 2013-06-07 22:31:27 -0400 | |
---|---|---|
committer | 2013-06-07 22:31:27 -0400 | |
commit | 7aa0f34365b5e1da827788c5bfcc612fcfd6b037 (patch) | |
tree | 795958e2feeb69fb6b1d113aca58687bee646e8b | |
parent | 2cf5814de61c272196ca1fcca88b45757e3ce327 (diff) | |
parent | cb6e0a6723c8b7b0a0940a5195d8251c29f5403c (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
4 files changed, 44 insertions, 1 deletions
diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn index b6256d5f3..038bee344 100644 --- a/doc/design/assistant/polls/Android_default_directory.mdwn +++ b/doc/design/assistant/polls/Android_default_directory.mdwn @@ -4,4 +4,4 @@ Same as the desktop webapp, users will be able to enter a directory they want the first time they run it, but to save typing on android, anything that gets enough votes will be included in a list of choices as well. -[[!poll open=yes expandable=yes 47 "/sdcard/annex" 3 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]] +[[!poll open=yes expandable=yes 47 "/sdcard/annex" 4 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]] diff --git a/doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_4_2dfda33ffa39b92b16c8bd9005e1cefe._comment b/doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_4_2dfda33ffa39b92b16c8bd9005e1cefe._comment new file mode 100644 index 000000000..e9f22adfd --- /dev/null +++ b/doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_4_2dfda33ffa39b92b16c8bd9005e1cefe._comment @@ -0,0 +1,21 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawl9J51AO9t75xN5k0sJgg8taUo4y0a4hpQ" + nickname="Daniel" + subject="comment 4" + date="2013-06-07T23:02:29Z" + content=""" +I'm trying to find a way to prevent developers from adding certain file types to the main repo. Is there something like a pre-add hook that could be used? + +I found this in another forum but I'm not sure how it was intended to be implemented. + +``` +git check-attr addtoannex \"$FILE\" | grep -q \": set$\" +if [ $? -eq 0 ]; then + git annex add \"$FILE\" +else + git add \"$FILE\" +fi +``` + +[http://git-annex.branchable.com/forum/Let_watch_selectively_annex_files/](http://git-annex.branchable.com/forum/Let_watch_selectively_annex_files/) +"""]] diff --git a/doc/tips/flickrannex/comment_10_50707f259abe5829ce075dfbecd5a4ba._comment b/doc/tips/flickrannex/comment_10_50707f259abe5829ce075dfbecd5a4ba._comment new file mode 100644 index 000000000..7bda45e5c --- /dev/null +++ b/doc/tips/flickrannex/comment_10_50707f259abe5829ce075dfbecd5a4ba._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8" + nickname="develop" + subject="comment 10" + date="2013-06-07T09:39:59Z" + content=""" +I'm not even sure if chunksize is exposed to the hooks at all. + +As it is, the hook will check the filesize, and if the filesize is more than 30mbyte it will exit 1. + +Chunking may be implemented down the road. I do believe joeyh might have some plans that will touch this issue, so I'd rather wait. Than re-invent the wheel yet again. + +"""]] diff --git a/doc/tips/flickrannex/comment_9_5299b4cab4a4cb8e8fd4d2b39f0ea59c._comment b/doc/tips/flickrannex/comment_9_5299b4cab4a4cb8e8fd4d2b39f0ea59c._comment new file mode 100644 index 000000000..f25cd04c1 --- /dev/null +++ b/doc/tips/flickrannex/comment_9_5299b4cab4a4cb8e8fd4d2b39f0ea59c._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawleVyKk2kQsB_HgEdS7w1s0BmgRGy1aay0" + nickname="Milan" + subject="chunksize" + date="2013-06-07T09:09:56Z" + content=""" +Hi! Does this backend support chunksize option? If yes, is it possible to set it after the remote has been added to the repository? +Thanks, Milan. +"""]] |