GitPlanet

Cheap and reliable Node.js hosting starts at $3/month, and $1/month static HTML hosting

Created with love in Canada, visit hostnodejs.com today

Feel like to post an Ad? Learn Details
All Projects → mkchoi212 → Fac

mkchoi212 / Fac

Licence: mit
Easy-to-use CUI for fixing git conflicts

Programming Languages

go
31211 projects - #10 most used programming language
Roff
2310 projects
shell
77523 projects
ruby
36898 projects - #4 most used programming language

Labels

gitcommand-lineutilityconflict-resolutioncui

Projects that are alternatives of or similar to Fac

Laravel Zero
A PHP framework for console artisans
Stars: ✭ 2,821 (+62.31%)
Mutual labels:  utility, command-line
Shpotify
A command-line interface to Spotify.
Stars: ✭ 1,782 (+2.53%)
Mutual labels:  utility, command-line
Gitlab Cli
Create a merge request from command line in gitlab
Stars: ✭ 224 (-87.11%)
Mutual labels:  utility, command-line
Xonotic Map Manager
A command line package manager for Xonotic community maps
Stars: ✭ 5 (-99.71%)
Mutual labels:  utility, command-line
Executor
Watch for file changes and then execute command. Very nice for test driven development.
Stars: ✭ 14 (-99.19%)
Mutual labels:  utility, command-line
Httpcat
httpcat is a simple utility for constructing raw HTTP requests on the command line.
Stars: ✭ 109 (-93.73%)
Mutual labels:  utility, command-line
Text Minimap
Generate text minimap/preview using Braille Patterns
Stars: ✭ 21 (-98.79%)
Mutual labels:  utility, command-line
Asciigraph
Go package to make lightweight ASCII line graph ╭┈╯ in command line apps with no other dependencies.
Stars: ✭ 1,805 (+3.86%)
Mutual labels:  utility, command-line
Argparse.jl
Package for parsing command-line arguments to Julia programs.
Stars: ✭ 131 (-92.46%)
Mutual labels:  command-line
Entrypoint
Composable CLI Argument Parser for all modern .Net platforms.
Stars: ✭ 136 (-92.17%)
Mutual labels:  command-line
Liblouis
Open-source braille translator and back-translator.
Stars: ✭ 129 (-92.58%)
Mutual labels:  command-line
The Way
A command line code snippets manager
Stars: ✭ 132 (-92.41%)
Mutual labels:  command-line
Cherchord
🎸 Find chords for any string instrument quicky & easily 🎸
Stars: ✭ 137 (-92.12%)
Mutual labels:  command-line
Progressbar
A really basic thread-safe progress bar for Golang applications
Stars: ✭ 2,212 (+27.27%)
Mutual labels:  command-line
Packagehunter
📥 [Android Library] Hunt down all package information
Stars: ✭ 137 (-92.12%)
Mutual labels:  utility
Cz Cli
The commitizen command line utility. #BlackLivesMatter
Stars: ✭ 12,671 (+629.06%)
Mutual labels:  command-line
Commandlineutils
Command line parsing and utilities for .NET
Stars: ✭ 1,782 (+2.53%)
Mutual labels:  command-line
Bashacks
Set of functions to increase productivity while hacking with Bash
Stars: ✭ 138 (-92.06%)
Mutual labels:  command-line
Fblog
Small command-line JSON Log viewer
Stars: ✭ 137 (-92.12%)
Mutual labels:  command-line
Kubebox
⎈❏ Terminal and Web console for Kubernetes
Stars: ✭ 1,855 (+6.73%)
Mutual labels:  cui
View All Similar Projects ➔


Easy-to-use CUI for fixing git conflicts


I never really liked any of the mergetools out there so I made a program that is somewhat easier to use.

Preview

👷 Installation

Execute:

$ go get github.com/mkchoi212/fac

Or using Homebrew 🍺

brew tap mkchoi212/fac https://github.com/mkchoi212/fac.git
brew install fac

🔧 Using

fac operates much like git add -p . It has a prompt input at the bottom of the screen where the user inputs various commands.

The commands have been preset to the following specifications

Keybinding Description
w show more lines up
s show more lines down
a use local version
d use incoming version
e manually edit code
j scroll down
k scroll up
v [v]iew orientation
n [n]ext conflict
p [p]revious conflict
h, ? [h]elp
q, Ctrl+c [q]uit 
[w,a,s,d,?] >> [INPUT HERE]

⚙️ Customization

The above key-bindings and various behaviors can be altered by creating a .fac.yml file in your home directory. Please refer to the configuration README.md for more information.

✋ Contributing

This is an open source project so feel free to contribute by

👮 License

See License

Note that the project description data, including the texts, logos, images, and/or trademarks, for each open source project belongs to its rightful owner. If you wish to add or remove any projects, please contact us at [email protected].