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