| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | merge bugfix |  Joey Hess | 2011-06-22 |
| * | rework core merge code | Joey Hess | 2011-06-22 |
| * | allow for union merges between a tree and the content in the index | Joey Hess | 2011-06-21 |
| * | export the commit function and generalize | Joey Hess | 2011-06-21 |
| * | Branch module complete | Joey Hess | 2011-06-21 |
| * | refactor | Joey Hess | 2011-06-21 |
| * | moved to library | Joey Hess | 2011-06-21 |
 |
index : git-annex-gpl | |
| git-annex without the AGPL |
| summaryrefslogtreecommitdiff |
path: root/GitUnionMerge.hs