| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | fix auto merge conflict resolution when doing out of tree merge for adjusted ... |  Joey Hess | 2016-04-06 |
| * | remove 163 lines of code without changing anything except imports | Joey Hess | 2016-01-20 |
| * | convert all commands to work with optparse-applicative | Joey Hess | 2015-07-08 |
| * | started converting to use optparse-applicative | Joey Hess | 2015-07-08 |
| * | update my email address and homepage url | Joey Hess | 2015-01-21 |
| * | doh't use "def" for command definitions, it conflicts with Data.Default.def |  Joey Hess | 2014-10-14 |
| * | hlint | Joey Hess | 2014-10-09 |
| * | resolvemerge: finish up by committing | Joey Hess | 2014-07-11 |
| * | resolvemerge: New plumbing command that runs the automatic merge conflict res... | Joey Hess | 2014-07-11 |
 |
index : git-annex-gpl | |
| git-annex without the AGPL |
| summaryrefslogtreecommitdiff |