| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | resolvemerge: finish up by committing |  Joey Hess | 2014-07-11 |
| * | Deal with change in git 2.0 that made indirect mode merge conflict resolution... | Joey Hess | 2014-07-11 |
| * | resolvemerge: New plumbing command that runs the automatic merge conflict res... | Joey Hess | 2014-07-11 |
| * | fix build warning5.20140709 | Joey Hess | 2014-07-09 |
| * | Fix bug in automatic merge conflict resolution | Joey Hess | 2014-07-08 |
| * | 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 |