index
:
fac
continuous
master
more-tests
no-enter
Mirror of https://github.com/mkchoi212/fac
matthias
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
Age
Commit message (
Expand
)
Author
2018-05-11
Add CI and Go report badges
Mike JS. Choi
2018-05-11
Remove dummy git repo
Mike JS. Choi
2018-05-11
Remove command tests
Mike JS. Choi
2018-05-11
Add Travis CI config file
Mike JS. Choi
2018-05-11
Colorize diff3 separator marker
Mike JS. Choi
2018-05-11
Add tests for summary.go
Mike JS. Choi
2018-05-11
Add support for diff3 conflict styling
Mike JS. Choi
2018-05-11
Move and rename dummy git repo
Mike JS. Choi
2018-05-11
Refactor git conflict marker parsing methods
Mike JS. Choi
2018-05-11
Ignore existing conflict in test git submodule
Mike JS. Choi
2018-05-11
Refactor git calling functions
Mike JS. Choi
2018-05-11
Add dummy git repo with conflict for testing
Mike JS. Choi
2018-05-11
Move documents to assets
Mike JS. Choi
2018-05-11
Update comments on functions
Mike JS. Choi
2018-05-11
Use dep
shogo-ma
2018-05-11
Remove vendor directory
shogo-ma
2018-04-06
Merge pull request #33 from shogo-ma/master
Mike JS. Choi
2018-04-07
fix typo
shogo-ma
2018-03-10
Merge pull request #27 from olshevskiy87/t1
Mike JS. Choi
2018-02-28
Merge pull request #31 from jnv/patch-1
Mike JS. Choi
2018-02-28
Goreleaser: Remove dep on go in Brew formula
Jan Vlnas
2018-02-04
Merge pull request #28 from antham/patch-1
Mike JS. Choi
2018-02-04
Fix typo
Anthony HAMON
2018-01-28
find and open conflict files from root git directory
Dmitriy Olshevskiy
2018-01-09
Merge pull request #24 from wezm/man
Mike JS. Choi
2018-01-10
Add man page
Wesley Moore
2018-01-06
fac version v1.0.4
Mike Choi
2018-01-06
Adjust scroll up behavior
v1.0.4
Mike JS. Choi
2018-01-06
Add warning message for unsupported diff3 conflict style
Mike JS. Choi
2018-01-06
Change function name
Mike JS. Choi
2018-01-06
Update README about diff3 support
Mike JS. Choi
2018-01-05
fac version v1.0.3
Mike Choi
2018-01-05
Update size of prompt panel to fit new prompt string
v1.0.3
Mike JS. Choi
2018-01-05
Update prompt string with a question mark
Mike JS. Choi
2018-01-05
Add additional edge case for when there are no conflicts
Mike JS. Choi
2018-01-04
Merge pull request #20 from shogo-ma/iota
Mike JS. Choi
2018-01-04
Merge pull request #19 from xyproto/emoji
Mike JS. Choi
2018-01-04
use iota identifier
shogo-ma
2018-01-04
Add missing emoji
Alexander F Rødseth
2018-01-03
Update LICENSE year :)
Mike JS. Choi
2018-01-03
Merge branch 'master' of https://github.com/mkchoi212/fac
Mike JS. Choi
2018-01-03
fac version v1.0.2
Mike Choi
2018-01-03
Update goreleaser file
v1.0.2
Mike JS. Choi
2018-01-03
Remove unused diffpatch library from godep
Mike JS. Choi
2018-01-03
Fix consecutive error handling logic
Mike JS. Choi
2018-01-03
Remove old diff toggle logic
Mike JS. Choi
2018-01-03
Move indicator arrow to left
Mike JS. Choi
2018-01-03
Merge branch 'master' of https://github.com/mkchoi212/fac
Mike JS. Choi
2018-01-03
Merge pull request #16 from eduardomoroni/patch-1
Mike JS. Choi
2018-01-03
missing brew install
Eduardo Moroni
[prev]
[next]