diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-20 19:44:45 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-20 21:37:18 -0400 |
| commit | c835166a7cebfa44d232bbed7c5b5e22bdfeb2bd (patch) | |
| tree | 2c27b9abcd52f49a2ce31568a75bf86ffc0e1e2c /Makefile | |
| parent | 91e50782ce6d634ffc8c2f809c80b6d4ff94a5ca (diff) | |
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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -6,8 +6,8 @@ GHCFLAGS=-prof -auto-all -rtsopts -caf-all -fforce-recomp $(IGNORE) endif GHCMAKE=ghc $(GHCFLAGS) --make -bins=git-annex git-annex-shell -mans=git-annex.1 git-annex-shell.1 +bins=git-annex git-annex-shell git-union-merge +mans=git-annex.1 git-annex-shell.1 git-union-merge.1 all: $(bins) $(mans) docs @@ -33,6 +33,8 @@ git-annex.1: doc/git-annex.mdwn ./mdwn2man git-annex 1 doc/git-annex.mdwn > git-annex.1 git-annex-shell.1: doc/git-annex-shell.mdwn ./mdwn2man git-annex-shell 1 doc/git-annex-shell.mdwn > git-annex-shell.1 +git-union-merge.1: doc/git-union-merge.mdwn + ./mdwn2man git-union-merge 1 doc/git-union-merge.mdwn > git-union-merge.1 install: all install -d $(DESTDIR)$(PREFIX)/bin |