| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | assistant: Fix bug, introduced in last release, that caused the assistant to ... |  Joey Hess | 2014-07-05 |
| * | support commit.gpgsign | Joey Hess | 2014-07-04 |
| * | simplify | Joey Hess | 2014-06-09 |
| * | avoid fast-forwarding when a merge conflict was auto-resolved | Joey Hess | 2014-06-09 |
| * | avoid bad commits after interrupted direct mode sync (or merge) | Joey Hess | 2014-06-09 |
| * | style | Joey Hess | 2014-03-04 |
| * | sync: Automatically resolve merge conflict between and annexed file and a reg... | Joey Hess | 2014-03-04 |
| * | factor out Annex.AutoMerge from Command.Sync | Joey Hess | 2014-03-04 |
 |
index : git-annex-gpl | |
| git-annex without the AGPL |
| summaryrefslogtreecommitdiff |