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-01-01
Change background color when conflict is resolved
Mike JS. Choi
2018-01-01
Remove diff option for now
Mike JS. Choi
2017-12-31
Fix odd height and refactor title format
Mike JS. Choi
2017-12-31
Change default view orientation and edit help
Mike JS. Choi
2017-12-31
Add next/prev conflict keyboard shortcuts
Mike JS. Choi
2017-12-31
Remove unncessary variable
Mike JS. Choi
2017-12-31
Major refactoring to go with seperated packages
Mike JS. Choi
2017-12-31
Create vendor directory with godep
Mike JS. Choi
2017-12-31
Add conlfict and color to imports
Mike JS. Choi
2017-12-31
Seperate conflict as seperate package
Mike JS. Choi
2017-12-31
Seperate color as seperate package
Mike JS. Choi
2017-12-31
Create Godeps folder
Mike JS. Choi
2017-12-31
Minor variable name changes
Mike JS. Choi
2017-12-31
Fix consecutive error help displaying code block
Mike JS. Choi
2017-12-31
Refactor Find function
Mike JS. Choi
2017-12-31
Delete old git.go file
Mike JS. Choi
2017-12-31
Add command file to handle os.Exec related functions
Mike JS. Choi
2017-12-31
Fix diff newline error
Mike JS. Choi
2017-12-30
Add seperate file for calling git
Mike JS. Choi
2017-12-30
Handle no conflict error
Mike JS. Choi
2017-12-30
Finish intial version of FinalizeChanges
Mike JS. Choi
2017-12-30
Retain all newlines and carriage returns when parsing files
Mike JS. Choi
2017-12-30
Create first version of WriteChanges
Mike JS. Choi
2017-12-30
Change bool Resolved conflict variable to Choice int variable
Mike JS. Choi
2017-12-30
Add z for toggling diff view
Mike JS. Choi
2017-12-30
Print help when user has no idea what he/she is doing
Mike JS. Choi
2017-12-30
Support multiple character inputs
Mike JS. Choi
2017-12-30
Add j and k for scrolling up and down
Mike JS. Choi
2017-12-29
Reorder functions in conflict
Mike JS. Choi
2017-12-29
Refactor color formatting code
Mike JS. Choi
2017-12-29
Fix printing summary at the end
Mike JS. Choi
2017-12-29
Add up and down scrolling to panel views
Mike JS. Choi
2017-12-29
Add gray color
Mike JS. Choi
2017-12-29
Change string literals to const vars
Mike JS. Choi
2017-12-29
Add q for quit
Mike JS. Choi
2017-12-29
Print summary after application exits
Mike JS. Choi
2017-12-29
Define additional colors and styles
Mike JS. Choi
2017-12-29
Print help with input character h
Mike JS. Choi
2017-12-29
Create colorize function for colored outputs
Mike JS. Choi
2017-12-29
Update header image
Mike JS. Choi
2017-12-29
Quit application when all conflicts have been resolved
Mike JS. Choi
2017-12-29
Parse invalid input command
Mike JS. Choi
2017-12-29
Rename conflict to parse
Mike JS. Choi
2017-12-29
Update README.md with license information
Mike JS. Choi
2017-12-29
Create LICENSE
Mike JS. Choi
2017-12-29
Update README.md with header image
Mike JS. Choi
2017-12-29
Move parse function
Mike JS. Choi
2017-12-29
Start handling enter key from input prompt
Mike JS. Choi
2017-12-29
Use color function
Mike JS. Choi
2017-12-29
Add color code
Mike JS. Choi
[prev]
[next]