https://github.com/alisaifee/confligt
Command line utility to find conflicting branches in git repositories
https://github.com/alisaifee/confligt
cli git
Last synced: about 1 month ago
JSON representation
Command line utility to find conflicting branches in git repositories
- Host: GitHub
- URL: https://github.com/alisaifee/confligt
- Owner: alisaifee
- License: mit
- Created: 2018-01-13T11:00:30.000Z (over 8 years ago)
- Default Branch: master
- Last Pushed: 2018-01-22T08:01:41.000Z (over 8 years ago)
- Last Synced: 2025-01-09T11:14:57.572Z (over 1 year ago)
- Topics: cli, git
- Language: Go
- Homepage:
- Size: 17.6 KB
- Stars: 2
- Watchers: 3
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
- License: LICENSE
Awesome Lists containing this project
README
## confligt
Find conflicting branches in git repositories
#### Installation
If you have a working golang development environment: `go get github.com/alisaifee/confligt`
If you are using a mac & use [homebrew](https://brew.sh/): `brew tap alisaifee/homebrew-tap && brew install confligt`
If you are on a debian based OS, grab a `.deb` from [here](https://github.com/alisaifee/confligt/releases/latest)
### Synopsis
Confligt finds conflicting branches in git repositories.
Without any arguments or flags, confligt will inspect all local & remote branches in the current working
directory - that have commits since 7 days ago - against each other and other remote branches
(from the default origin) to find conflicting pairs.
```
confligt [flags]
```
### Examples
```
# Filter by branches that were updated a day ago
$ confligt --since='1 day'
# Filter by branches that start with foo- or bar-
$ confligt --filter='\b(foo|bar)-'
# Inspect branches in the remote named alice. Use develop as the default branch.
$ confligt --remote=alice --main=develop
```
### Options
```
--concurrency int Number of branches to check concurrently (default NUMCPUs/2)
--config string config file (default is $HOME/.confligt.yaml)
--fetch Fetch from remote before inspecting
--filter string Regular expression to match branch names against
-h, --help help for confligt
--include-local Include local branches when finding conflicts (default true)
--include-remote Include remote branches when finding conflicts (default true)
-m, --main string Name of main branch (default "master")
--mine Inspect only your own branches
-r, --remote string Name of remote (default "origin")
-s, --since string Consider branches with commits since (default "7 days")
-v, --verbose Display verbose logging
```