summaryrefslogtreecommitdiff
path: root/Annex/Branch.hs
Commit message (Collapse)AuthorAge
...
* performance fixGravatar Joey Hess2011-10-07
| | | | | It was checking if it needed to merge on every branch access, fix it to only check once.
* avoid merging multiple branches that point to the same treeGravatar Joey Hess2011-10-07
| | | | avoids git warning "error: duplicate parent xxx ignored"
* faster union merge of multiple branches into indexGravatar Joey Hess2011-10-07
| | | | only write index once
* renameGravatar Joey Hess2011-10-05
|
* renameGravatar Joey Hess2011-10-04