diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-29 11:07:40 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-29 11:07:40 -0400 |
| commit | e193da8230e0d758acd09cd82d653acf8088304f (patch) | |
| tree | 95b6ba691a67109acfae9010f1bf56c78651d62c /doc/design | |
| parent | aedbb77de224cec157da35a0718a66e45493979e (diff) | |
| parent | 495fad0cad63e9712b0236e57759f49565b7b70c (diff) | |
Merge branch 'master' into adjustedbranch
Diffstat (limited to 'doc/design')
| -rw-r--r-- | doc/design/adjusted_branches/comment_2_ff7cbdf93f0be5886f212bdd411efb5b._comment | 9 | ||||
| -rw-r--r-- | doc/design/assistant/blog/day_150__12__58__12.mdwn (renamed from doc/design/assistant/blog/day_150__12:12.mdwn) | 0 | ||||
| -rw-r--r-- | doc/design/assistant/polls/Android_default_directory.mdwn | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/doc/design/adjusted_branches/comment_2_ff7cbdf93f0be5886f212bdd411efb5b._comment b/doc/design/adjusted_branches/comment_2_ff7cbdf93f0be5886f212bdd411efb5b._comment new file mode 100644 index 000000000..6a3502997 --- /dev/null +++ b/doc/design/adjusted_branches/comment_2_ff7cbdf93f0be5886f212bdd411efb5b._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 2""" + date="2016-03-14T20:38:09Z" + content=""" +Yes, lots of things are possible with this. Filtering to only annexed files +probably. May be some hairyness around updating the branch when files are +got or dropped. Matching a preferred content expression, maybe.. +"""]] diff --git a/doc/design/assistant/blog/day_150__12:12.mdwn b/doc/design/assistant/blog/day_150__12__58__12.mdwn index 8e1f192db..8e1f192db 100644 --- a/doc/design/assistant/blog/day_150__12:12.mdwn +++ b/doc/design/assistant/blog/day_150__12__58__12.mdwn diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn index 3febc95a1..b2b22a20b 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 73 "/sdcard/annex" 6 "Whole /sdcard" 8 "DCIM directory (photos and videos only)" 2 "Same as for regular git-annex. ~/annex/"]] +[[!poll open=yes expandable=yes 73 "/sdcard/annex" 6 "Whole /sdcard" 8 "DCIM directory (photos and videos only)" 3 "Same as for regular git-annex. ~/annex/"]] |