2013-10-20 21:50:51 +00:00
|
|
|
tags
|
|
|
|
|
Setup
|
|
|
|
|
*.hi
|
|
|
|
|
*.o
|
2012-03-15 03:50:28 +00:00
|
|
|
tmp
|
2010-11-10 14:52:59 +00:00
|
|
|
test
|
2011-08-20 20:11:42 +00:00
|
|
|
Build/SysConfig.hs
|
2013-04-14 20:00:31 +00:00
|
|
|
Build/InstallDesktopFile
|
|
|
|
|
Build/EvilSplicer
|
|
|
|
|
Build/Standalone
|
|
|
|
|
Build/OSXMkLibs
|
2013-12-24 17:25:40 +00:00
|
|
|
Build/LinuxMkLibs
|
2014-06-18 18:43:20 +00:00
|
|
|
Build/BuildVersion
|
2016-06-02 20:54:13 +00:00
|
|
|
Build/MakeMans
|
2010-10-10 04:18:16 +00:00
|
|
|
git-annex
|
2017-03-17 23:19:10 +00:00
|
|
|
git-annex-shell
|
2015-03-23 19:40:22 +00:00
|
|
|
man
|
2013-10-20 21:50:51 +00: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 23:44:45 +00:00
|
|
|
git-union-merge.1
|
2010-10-19 19:59:40 +00:00
|
|
|
doc/.ikiwiki
|
|
|
|
|
html
|
2011-01-05 01:05:31 +00:00
|
|
|
*.tix
|
|
|
|
|
.hpc
|
2011-06-30 18:55:03 +00:00
|
|
|
dist
|
2012-06-12 07:39:21 +00:00
|
|
|
# Sandboxed builds
|
2012-06-11 02:03:35 +00:00
|
|
|
cabal-dev
|
2014-04-08 13:37:04 +00:00
|
|
|
.cabal-sandbox
|
|
|
|
|
cabal.sandbox.config
|
2015-12-28 21:19:07 +00:00
|
|
|
.stack-work
|
2012-06-12 07:39:21 +00:00
|
|
|
# Project-local emacs configuration
|
|
|
|
|
.dir-locals.el
|
2012-09-23 09:30:32 +00:00
|
|
|
# OSX related
|
|
|
|
|
.DS_Store
|
2012-11-09 15:28:43 +00:00
|
|
|
.virthualenv
|
2014-01-24 16:55:56 +00:00
|
|
|
.tasty-rerun-log
|