diff options
| -rw-r--r-- | Command/Sync.hs | 1 | ||||
| -rw-r--r-- | doc/install/OSX.mdwn | 18 |
2 files changed, 9 insertions, 10 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index beb1e1a39..e5ab4cf4b 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -321,6 +321,7 @@ resolveMerge = do , Param "-m" , Param "git-annex automatic merge conflict fix" ] + showLongNote "Merge conflict was automatically resolved; you may want to examine the result." return merged resolveMerge' :: LsFiles.Unmerged -> Annex (Maybe FilePath) diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn index fba44e2a4..93be7d124 100644 --- a/doc/install/OSX.mdwn +++ b/doc/install/OSX.mdwn @@ -1,12 +1,13 @@ ## git-annex.app [[!img /assistant/osx-app.png align=right link=/assistant]] -For easy installation, use the -[beta release of git-annex.app](https://downloads.kitenet.net/git-annex/OSX/current/). +For easy installation, use the prebuilt app bundle. -Be sure to select the build matching your version of OSX. +* 10.9 Mavericks: [git-annex.dmg.bz2](https://downloads.kitenet.net/git-annex/OSX/current/10.9_Mavericks/git-annex.dmg.bz2 10.9) +* 10.8.2 Mountain Lion: [git-annex.dmg.bz2] (https://downloads.kitenet.net/git-annex/OSX/current/10.8.2_Mountain_Lion/git-annex.dmg.bz2) **warning: not being updated any longer** +* 10.7.5 Lion: [git-annex.dmg.bz2](https://downloads.kitenet.net/git-annex/OSX/current/10.7.5_Lion/git-annex.dmg.bz2) -If you want to run the [[git-annex_assistant|/assistant]], just +To run the [[git-annex_assistant|/assistant]], just install the app, look for the icon, and start it up. To use git-annex at the command line, you can add @@ -17,20 +18,17 @@ Alternatively, from the command line you can run programs bundled inside the app, including not just git-annex, but git, and several more. Handy if you don't otherwise have git installed. -This is still a work in progress. See [[/bugs/OSX_app_issues]] for problem -reports. - ## autobuilds [Jimmy Tang](http://www.sgenomics.org/~jtang/) autobuilds the app for OSX Lion. -* [autobuild of git-annex.app](http://www.sgenomics.org/~jtang/gitbuilder-git-annex-x00-x86_64-apple-darwin10.8.0-binary/ref/master/git-annex.dmg.bz2) ([build logs](http://www.sgenomics.org/~jtang/gitbuilder-git-annex-x00-x86_64-apple-darwin10.8.0-binary/)) +* [autobuild of git-annex.dmg.bz2](http://www.sgenomics.org/~jtang/gitbuilder-git-annex-x00-x86_64-apple-darwin10.8.0-binary/ref/master/git-annex.dmg.bz2) ([build logs](http://www.sgenomics.org/~jtang/gitbuilder-git-annex-x00-x86_64-apple-darwin10.8.0-binary/)) * [past builds](http://www.sgenomics.org/~jtang/gitbuilder-git-annex-x00-x86_64-apple-darwin10.8.0-binary/sha1/) -- directories are named from the commitid's -[[Joey]] autobuilds the app for Mountain Lion. +[[Joey]] autobuilds the app for Mavericks. -* [autobuild of git-annex.app](https://downloads.kitenet.net/git-annex/autobuild/x86_64-apple-mountain-lion/git-annex.dmg.bz2) ([build logs](https://downloads.kitenet.net/git-annex/autobuild/x86_64-apple-mountain-lion/)) +* [autobuild of git-annex.dmg.bz2](https://downloads.kitenet.net/git-annex/autobuild/x86_64-apple-mavericks/git-annex.dmg.bz2) ([build logs](https://downloads.kitenet.net/git-annex/autobuild/x86_64-apple-mavericks/)) ## using Brew |