Commit message (Expand) | Author | Age | |
---|---|---|---|
* | showStart variant for when there's no worktree file | 2017-11-28 | |
* | Avoid backtraces on expected failures when built with ghc 8; only use backtra... | 2016-11-15 | |
* | fix auto merge conflict resolution when doing out of tree merge for adjusted ... | 2016-04-06 | |
* | remove 163 lines of code without changing anything except imports | 2016-01-20 | |
* | convert all commands to work with optparse-applicative | 2015-07-08 | |
* | started converting to use optparse-applicative | 2015-07-08 | |
* | update my email address and homepage url | 2015-01-21 | |
* | doh't use "def" for command definitions, it conflicts with Data.Default.def | 2014-10-14 | |
* | hlint | 2014-10-09 | |
* | resolvemerge: finish up by committing | 2014-07-11 | |
* | resolvemerge: New plumbing command that runs the automatic merge conflict res... | 2014-07-11 |