aboutsummaryrefslogtreecommitdiff
path: root/Git/UnionMerge.hs
Commit message (Expand)AuthorAge
* Always use filesystem encoding for all file and handle reads and writes.Gravatar Joey Hess2016-12-24
* Sped up git-annex merge by using git hash-object --batch.Gravatar Joey Hess2016-03-14
* avoid nul-truncationGravatar Joey Hess2015-08-11
* spotted a few more places where diff-tree needed --Gravatar Joey Hess2015-04-09
* fix union merge to call diff-index with -- after the refGravatar Joey Hess2015-04-09
* update my email address and homepage urlGravatar Joey Hess2015-01-21
* union merge bugfixGravatar Joey Hess2013-01-16
* finished where indentation changesGravatar Joey Hess2012-12-13
* fix slightly incorrect commentGravatar Joey Hess2012-10-12
* more zombie fightingGravatar Joey Hess2012-10-04
* Got rid of the last place that did utf8 decoding.Gravatar Joey Hess2012-06-26
* refactor and function name cleanupGravatar Joey Hess2012-06-08
* make watch use the queueGravatar Joey Hess2012-06-07
* add support for staging other types of blobs, like symlinks, into the indexGravatar Joey Hess2012-06-06
* move hashObject to HashObject library and generalize it to support all git ob...Gravatar Joey Hess2012-06-06
* factor out generic update-index code from unionmerge codeGravatar Joey Hess2012-06-06
* noopGravatar Joey Hess2012-04-21
* wordingGravatar Joey Hess2012-02-09
* use fileEncoding for git-update-index input handleGravatar Joey Hess2012-02-04
* support all filename encodings with ghc 7.4Gravatar Joey Hess2012-02-03
* attempt at a quick, utf-8 only fix to the ghc 7.4 problemGravatar Joey Hess2012-02-01
* log --after=dateGravatar Joey Hess2012-01-06
* more partial function removalGravatar Joey Hess2011-12-15
* split out Git/Command.hsGravatar Joey Hess2011-12-14
* split more stuff out of Git.hsGravatar Joey Hess2011-12-14
* always find optimal mergeGravatar Joey Hess2011-12-12
* refactorGravatar Joey Hess2011-12-12
* more efficient union mergesGravatar Joey Hess2011-12-11
* hslintGravatar Joey Hess2011-12-09
* improve type signatures with a Ref newtypeGravatar Joey Hess2011-11-16
* better nameGravatar Joey Hess2011-11-16
* cleanupGravatar Joey Hess2011-11-15
* merge: Now runs in constant space.Gravatar Joey Hess2011-11-15
* cleanupGravatar Joey Hess2011-11-15
* avoid space leak writing mergeGravatar Joey Hess2011-11-15
* Optimised union merging; now only runs git cat-file once.Gravatar Joey Hess2011-11-12
* lintGravatar Joey Hess2011-11-11
* reorder repo parameters lastGravatar Joey Hess2011-11-08
* faster union merge of multiple branches into indexGravatar Joey Hess2011-10-07
* convert all git read/write functions to use ByteStringsGravatar Joey Hess2011-09-29
* use ByteStrings when reading content of filesGravatar Joey Hess2011-09-29
* split groups of related functions out of UtilityGravatar Joey Hess2011-08-22
* hlint tweaksGravatar Joey Hess2011-07-15
* rename GitUnionMerge to Git.UnionMergeGravatar Joey Hess2011-06-30
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-19 12:11:55 +0000