mkchoi212/fac

Easy-to-use CUI for fixing git conflicts

1,853

stars

206

commits

primary language

Dec 29, 2023

updated

command-line

conflict-resolution

cui

git

golang

utility

README

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 install github.com/mkchoi212/fac@latest

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

Opening an issue
Sending me feedback via email
Or tweet at me!

👮 License

See License

Contributors

187 commits

4 commits

2 commits

2 commits

Similar repos

mergestat/mergestat-lite

Query git repositories with SQL. Generate reports, perform status checks, analyze codebases. 🔍 📊

3,520

shared topics

sharkdp/bat

A cat(1) clone with wings.

60,404

shared topics

commitizen/cz-cli

The commitizen command line utility. #BlackLivesMatter

17,499

shared topics

trebaud/diffcat

TUI for visualizing git diffs

bmf-san/ggc

A modern Git CLI tool with both traditional command-line and interactive incremental-search UI.

285

httpie/httpcat

httpcat is a simple utility for constructing raw HTTP requests on the command line.

255

shared topics

GitGud-org/GitGud

A CLI tool for Git. Available as an NPM package.

116

kitlangton/ghui

A GitHub TUI

1,106

Languages

91.6%

Roff

5.8%

Shell

2.0%

mkchoi212/fac

Easy-to-use CUI for fixing git conflicts

1,853

stars

206

commits

primary language

Dec 29, 2023

updated

command-line

conflict-resolution

cui

git

golang

utility

README

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 install github.com/mkchoi212/fac@latest

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.