diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-25 18:10:29 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-25 18:10:29 -0400 |
| commit | 7b15c2146cb3fcb60a95dd6df435b34bd97e39db (patch) | |
| tree | 203a20373b70a2ec23799a52bc952e98645060d5 | |
| parent | ec8270cb586cc541b57abb2e3e7e8240b3fd6cc8 (diff) | |
| parent | 73607fa3e4133fa12d36fc4ed0753f7ca4111588 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/devblog/day_108__new_use_for_location_tracking.mdwn | 2 | ||||
| -rw-r--r-- | doc/devblog/day_122_more_windows_porting.mdwn | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/devblog/day_108__new_use_for_location_tracking.mdwn b/doc/devblog/day_108__new_use_for_location_tracking.mdwn index cf0d3e096..62e40672f 100644 --- a/doc/devblog/day_108__new_use_for_location_tracking.mdwn +++ b/doc/devblog/day_108__new_use_for_location_tracking.mdwn @@ -4,7 +4,7 @@ option can now be told to match files that were in a repository at some point in the past. For example, `git annex get --in=here@{yesterday}` will get any files that have been dropped over the past day. -While git-annex's location tracking info is stored in git and so versioned, +While git-annex's location tracking info is stored in git and thus versioned, very little of it makes use of past versions of the location tracking info (only `git annex log`). I'm happy to have finally found a use for it! diff --git a/doc/devblog/day_122_more_windows_porting.mdwn b/doc/devblog/day_122_more_windows_porting.mdwn index 6f87a0bc0..7b496f670 100644 --- a/doc/devblog/day_122_more_windows_porting.mdwn +++ b/doc/devblog/day_122_more_windows_porting.mdwn @@ -1,4 +1,4 @@ -More windows porting. Made the build completely -Wall safe on Windows. +More Windows porting. Made the build completely `-Wall` safe on Windows. Fixed some DOS path separator bugs that were preventing WebDav from working. Have now tested both box.com and Amazon S3 to be completely working in the webapp on Windows. |