diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-19 18:35:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-19 18:35:07 -0400 |
| commit | dbe7d0e7fe884042694a1db077fee9a9d50f97a8 (patch) | |
| tree | 85a4b585037da1e9d18a5ae16c5677e03a89cf5d | |
| parent | 2a079a9d378b7c9fd9bab4b6c75efb1cb39dddf4 (diff) | |
| parent | c838a35d832c9f570ea3cbaf08abc53cd713ea80 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/bugs/watch_command_on_OSX_10.7.mdwn | 4 | ||||
| -rw-r--r-- | doc/forum/autobuilders_for_git-annex_to_aid_development.mdwn | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/bugs/watch_command_on_OSX_10.7.mdwn b/doc/bugs/watch_command_on_OSX_10.7.mdwn index a522c504a..1348c1155 100644 --- a/doc/bugs/watch_command_on_OSX_10.7.mdwn +++ b/doc/bugs/watch_command_on_OSX_10.7.mdwn @@ -25,9 +25,9 @@ laplace:annex jtang$ git status nothing added to commit but untracked files present (use "git add" to track) </pre> -It seems to not do a git add and commit afterw the creation of the symlinks, manually doing this makes it all happy again till more files are added. +It seems to not do a git add and commit after the creation of the symlinks, manually doing this makes it all happy again till more files are added. -note: i had posted a commend in the blog post, but posting the issue here is probably more appropriate. +note: i had posted a comment in the blog post, but posting the issue here is probably more appropriate. > Yeah, this is the issue I was struggling with last night. > I think it's fixed in 57cf65eb6d811ba7fd19eb62a54e3b83a0c2dfa7, diff --git a/doc/forum/autobuilders_for_git-annex_to_aid_development.mdwn b/doc/forum/autobuilders_for_git-annex_to_aid_development.mdwn index 8cd370937..2c1280e51 100644 --- a/doc/forum/autobuilders_for_git-annex_to_aid_development.mdwn +++ b/doc/forum/autobuilders_for_git-annex_to_aid_development.mdwn @@ -31,4 +31,4 @@ if [ "$?" = 1 ]; then fi </pre> -It's also using the branches-local script for sorting and prioritising the branches to build, this branches-local script can be found at the [autobuild-ceph](https://github.com/ceph/autobuild-ceph/blob/master/branches-local) repository. If there are other people interested in setting up their own instances of gitbuilder for git-annex, please let me know and I will setup an aggregator page to collect status of the builds. The builder runs and updates the webpage every 30mins. +It's also using the branches-local script for sorting and prioritising the branches to build, this branches-local script can be found at the [autobuild-ceph](https://github.com/ceph/autobuild-ceph/blob/master/branches-local) repository. If there are other people interested in setting up their own instances of gitbuilder for git-annex, please let me know and I will setup an aggregator page to collect status of the builds. The builder runs and updates on a very regular basis. |