Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | partial and incomplete automatic merging in direct mode | 2012-12-18 | ||
| | | | | Handles our file right, but not theirs. | |||
* | unused | 2012-12-18 | ||
| | ||||
* | update | 2012-12-18 | ||
| | ||||
* | direct mode merging works! | 2012-12-18 | ||
| | | | | | Automatic merge resoltion code needs to be fixed to preserve objects from direct mode files. | |||
* | Merge branch 'master' into desymlink | 2012-12-18 | ||
|\ | ||||
| * | vicfg: Quote filename. Closes: #696193 | 2012-12-18 | ||
| | | ||||
| * | new autobuilder | 2012-12-17 | ||
| | | ||||
| * | blog for the day | 2012-12-17 | ||
| | | ||||
* | | Merge branch 'master' into desymlink | 2012-12-17 | ||
|\| | | | | | | | | | | | Conflicts: debian/changelog doc/design/assistant/desymlink.mdwn | |||
| * | close fixed OSX issues | 2012-12-17 | ||
| | | ||||
| * | OSX Mountian Lion builds now available | 2012-12-17 | ||
| | | ||||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | 2012-12-17 | ||
| |\ | ||||
| * | | move tip from forum to tips | 2012-12-17 | ||
| | | | ||||
| | * | Added a comment | 2012-12-17 | ||
| |/ | ||||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | 2012-12-17 | ||
| |\ | ||||
| | * | Added a comment | 2012-12-17 | ||
| | | | ||||
| | * | Added a comment | 2012-12-17 | ||
| | | | ||||
| * | | back to $SHELL for OSX app | 2012-12-17 | ||
| | | | | | | | | | | | | | | | This is safe because we no longer mess with LD_PRELOAD equivilants. Since the linux standalone bundle still does, it continues to run sh. | |||
| | * | Added a comment | 2012-12-17 | ||
| | | | ||||
| | * | Added a comment: OSX troubles | 2012-12-17 | ||
| |/ | ||||
| * | (no commit message) | 2012-12-17 | ||
| | | ||||
| * | removing archive pages, which broke the blog and I don't want | 2012-12-16 | ||
| | | ||||
| * | Added a comment | 2012-12-16 | ||
| | | ||||
| * | Added a comment: Thanks! | 2012-12-16 | ||
| | | ||||
| * | Added a comment | 2012-12-16 | ||
| | | ||||
| * | Added a comment | 2012-12-16 | ||
| | | ||||
| * | (no commit message) | 2012-12-15 | ||
| | | ||||
| * | (no commit message) | 2012-12-15 | ||
| | | ||||
| * | calendar update | 2012-12-15 | ||
| | | ||||
| * | Added a comment | 2012-12-15 | ||
| | | ||||
| * | move away 2 old comments that I think are now addressed in the install ↵ | 2012-12-14 | ||
| | | | | | | | | instructions | |||
| * | cabal: add missing depend to 'test-suite', guard against 'kqueue' on linux | 2012-12-14 | ||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the following test failure: Preprocessing test suite 'test' for git-annex-3.20121211... Remote/Git.hs:42:8: Could not find module `Control.Concurrent.MSampleVar' It is a member of the hidden package `SafeSemaphore-0.9.0'. Perhaps you need to add `SafeSemaphore' to the build-depends in your .cabal file. Use -v to see a list of the files searched for. Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> | |||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | 2012-12-14 | ||
| |\ | ||||
| * | | blog for the day | 2012-12-14 | ||
| | | | ||||
| | * | Added a comment | 2012-12-14 | ||
| |/ | ||||
| * | kqueue: Fix bug that made broken symlinks not be noticed. | 2012-12-14 | ||
| | | ||||
| * | move thirdparty program installation for standalone bundle into haskell program | 2012-12-14 | ||
| | | | | | | | | | | | | | | | | | | This allows it to use Build.SysConfig to always install the programs configure detected. Amoung other fixes, this ensures the right uuid generator and checksum programs are installed. I also cleaned up the handling of lsof's path; configure now checks for it in PATH, but falls back to looking for it in sbin directories. | |||
| * | quiet shell error message | 2012-12-14 | ||
| | | ||||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | 2012-12-14 | ||
| |\ | ||||
| * | | typo | 2012-12-14 | ||
| | | | ||||
| | * | Added a comment | 2012-12-14 | ||
| |/ | ||||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | 2012-12-14 | ||
| |\ | ||||
| * | | add calendar sidebar | 2012-12-14 | ||
| | | | ||||
| | * | (no commit message) | 2012-12-14 | ||
| | | | ||||
| | * | Added a comment: OS/X daily 2012-12-13 | 2012-12-14 | ||
| | | | ||||
| | * | escape ^ | 2012-12-14 | ||
| | | | ||||
| | * | Added a comment | 2012-12-13 | ||
| |/ | ||||
| * | Added a comment | 2012-12-13 | ||
| | | ||||
| * | (no commit message) | 2012-12-13 | ||
| | | ||||
| * | Added a comment | 2012-12-13 | ||
| | |