mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2013-09-05 11:15:53 -04:00
commit 37f0c448a1
4 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/design/assistant/polls/Android_default_directory.mdwn
View file

@ -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 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. that gets enough votes will be included in a list of choices as well.
[[!poll open=yes expandable=yes 55 "/sdcard/annex" 5 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]] [[!poll open=yes expandable=yes 57 "/sdcard/annex" 5 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]

10
doc/devblog/day_2__new_laptop/comment_1_93447dbd4eb09b4db96770644ea663cb._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA"
nickname="Laszlo"
subject="comment 1"
date="2013-09-05T15:07:44Z"
content="""
out of curiosity, what laptop model have you choosen finally?
Laszlo
"""]]

2
doc/tips/assume-unstaged.mdwn
View file

@ -11,7 +11,7 @@ annoyingly slow, you can turn it on:
git config core.ignoreStat true git config core.ignoreStat true
When git mv and git rm are used, those changes *do* get noticed, even When `git mv` and `git rm` are used, those changes *do* get noticed, even
on assume-unchanged files. When new files are added, eg by `git annex add`, on assume-unchanged files. When new files are added, eg by `git annex add`,
they are also noticed. they are also noticed.

13
doc/tips/assume-unstaged/comment_2_5b589f37cfc03bf7be33a51826cc4dba._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnxlx1UrzVhdy6_gFjzmF42x6QXxBUxg00"
nickname="Jakukyo"
subject="comment 2"
date="2013-09-05T12:14:42Z"
content="""
> There are two gotchas...
So just always run `git annex add` after editing a file
and `git update-index --really-refresh` after migrating
backend?
"""]]