git-annex/.gitignore

tags
Setup
*.hi
*.o
tmp
test
Build/SysConfig.hs
Build/InstallDesktopFile
Build/EvilSplicer
Build/Standalone
Build/OSXMkLibs
Build/LinuxMkLibs
Build/BuildVersion
Build/MakeMans
git-annex
man
git-union-merge
git-union-merge.1
doc/.ikiwiki
html
*.tix
.hpc
dist
# Sandboxed builds
cabal-dev
.cabal-sandbox
cabal.sandbox.config
.stack-work
# Project-local emacs configuration
.dir-locals.el
# OSX related
.DS_Store
.virthualenv
.tasty-rerun-log
git-recover-repository 1/2 done 2013-10-20 17:50:51 -04:00			`tags`
			`Setup`
			`*.hi`
			`*.o`
makefile tweaks Put build cruft in a subdir 2012-03-14 23:50:28 -04:00			`tmp`
update 2010-11-10 10:52:59 -04:00			`test`
moved files around 2011-08-20 16:11:42 -04:00			`Build/SysConfig.hs`
avoid runghc 2013-04-14 16:00:31 -04:00			`Build/InstallDesktopFile`
			`Build/EvilSplicer`
			`Build/Standalone`
			`Build/OSXMkLibs`
update for LinuxMkLibs 2013-12-24 13:25:40 -04:00			`Build/LinuxMkLibs`
gitignore Build/BuildVersion 2014-06-18 14:43:20 -04:00			`Build/BuildVersion`
fix man page building 2016-06-02 16:54:13 -04:00			`Build/MakeMans`
add 2010-10-10 00:18:16 -04:00			`git-annex`
move build man pages to man/ from top dir 2015-03-23 15:40:22 -04:00			`man`
git-recover-repository 1/2 done 2013-10-20 17:50:51 -04:00			`git-union-merge`
add git-union-merge This is a new git subcommand, that does a generic union merge operation between two refs, storing the result in a branch. It operates efficiently without touching the working tree. It does need to write out a temporary index file, and may need to write out some other temp files as well. This could be useful for anything that stores data in a branch, and needs to merge changes into that branch without actually checking the branch out. Since conflict handling can't be done without a working copy, the merge type is always a union merge, which is fine for data stored in log format (as git-annex does), or in non-conflicting files (as pristine-tar does). This probably belongs in git proper, but it will live in git-annex for now. --- Plan is to move .git-annex/ to a git-annex branch, and use git-union-merge to handle merging changes when pulling from remotes. Some preliminary benchmarking using real .git-annex/ data indicates that it's quite fast, except for the "git add" call, which is as slow as "git add" tends to be with a big index. 2011-06-20 19:44:45 -04:00			`git-union-merge.1`
update 2010-10-19 15:59:40 -04:00			`doc/.ikiwiki`
			`html`
add testcoverage target using hpc added a test for key read and show 2011-01-04 21:05:31 -04:00			`*.tix`
			`.hpc`
cabal can now be used to build git-annex. This is substantially slower than using make, does not build or install documentation, does not run the test suite, and is not particularly recommended, but could be useful to some. 2011-06-30 14:55:03 -04:00			`dist`
Remove .dir-locals.el and add doc/contributing.mdwn. Add link CONTRIBUTING -> doc/contributing.mdwn, so that it's easy to find (many files in doc/). Add .dir-locals.el to .gitignore, now that it's no longer versioned. The CONTRIBUTING file gives a reference to a page on the Emacs wiki that shows how to set up a .dir-locals.el that sets up tabs for indentation. I updated the wiki page to include the `(highlight-regexp "^ *")` part, which had been the hardest to discover. 2012-06-12 00:39:21 -07:00			`# Sandboxed builds`
Add cabal-dev to .gitignore. 2012-06-10 19:03:35 -07:00			`cabal-dev`
.gitignore: add cabal sandbox dir and config files 2014-04-08 23:37:04 +10:00			`.cabal-sandbox`
			`cabal.sandbox.config`
add .stack-work 2015-12-28 17:19:07 -04:00			`.stack-work`
Remove .dir-locals.el and add doc/contributing.mdwn. Add link CONTRIBUTING -> doc/contributing.mdwn, so that it's easy to find (many files in doc/). Add .dir-locals.el to .gitignore, now that it's no longer versioned. The CONTRIBUTING file gives a reference to a page on the Emacs wiki that shows how to set up a .dir-locals.el that sets up tabs for indentation. I updated the wiki page to include the `(highlight-regexp "^ *")` part, which had been the hardest to discover. 2012-06-12 00:39:21 -07:00			`# Project-local emacs configuration`
			`.dir-locals.el`
Ignore some OSX related files which should never end up in the repo 2012-09-23 10:30:32 +01:00			`# OSX related`
			`.DS_Store`
add some OSX thing 2012-11-09 11:28:43 -04:00			`.virthualenv`
ignore update 2014-01-24 12:55:56 -04:00			`.tasty-rerun-log`