index
:
git-annex-gpl
master
git-annex without the AGPL
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
Git
/
UnionMerge.hs
Commit message (
Expand
)
Author
Age
*
union merge bugfix
Joey Hess
2013-01-16
*
finished where indentation changes
Joey Hess
2012-12-13
*
fix slightly incorrect comment
Joey Hess
2012-10-12
*
more zombie fighting
Joey Hess
2012-10-04
*
Got rid of the last place that did utf8 decoding.
Joey Hess
2012-06-26
*
refactor and function name cleanup
Joey Hess
2012-06-08
*
make watch use the queue
Joey Hess
2012-06-07
*
add support for staging other types of blobs, like symlinks, into the index
Joey Hess
2012-06-06
*
move hashObject to HashObject library and generalize it to support all git ob...
Joey Hess
2012-06-06
*
factor out generic update-index code from unionmerge code
Joey Hess
2012-06-06
*
noop
Joey Hess
2012-04-21
*
wording
Joey Hess
2012-02-09
*
use fileEncoding for git-update-index input handle
Joey Hess
2012-02-04
*
support all filename encodings with ghc 7.4
Joey Hess
2012-02-03
*
attempt at a quick, utf-8 only fix to the ghc 7.4 problem
Joey Hess
2012-02-01
*
log --after=date
Joey Hess
2012-01-06
*
more partial function removal
Joey Hess
2011-12-15
*
split out Git/Command.hs
Joey Hess
2011-12-14
*
split more stuff out of Git.hs
Joey Hess
2011-12-14
*
always find optimal merge
Joey Hess
2011-12-12
*
refactor
Joey Hess
2011-12-12
*
more efficient union merges
Joey Hess
2011-12-11
*
hslint
Joey Hess
2011-12-09
*
improve type signatures with a Ref newtype
Joey Hess
2011-11-16
*
better name
Joey Hess
2011-11-16
*
cleanup
Joey Hess
2011-11-15
*
merge: Now runs in constant space.
Joey Hess
2011-11-15
*
cleanup
Joey Hess
2011-11-15
*
avoid space leak writing merge
Joey Hess
2011-11-15
*
Optimised union merging; now only runs git cat-file once.
Joey Hess
2011-11-12
*
lint
Joey Hess
2011-11-11
*
reorder repo parameters last
Joey Hess
2011-11-08
*
faster union merge of multiple branches into index
Joey Hess
2011-10-07
*
convert all git read/write functions to use ByteStrings
Joey Hess
2011-09-29
*
use ByteStrings when reading content of files
Joey Hess
2011-09-29
*
split groups of related functions out of Utility
Joey Hess
2011-08-22
*
hlint tweaks
Joey Hess
2011-07-15
*
rename GitUnionMerge to Git.UnionMerge
Joey Hess
2011-06-30