gitui/README.md

180 lines
6.5 KiB
Markdown
Raw Normal View History

2020-04-03 17:47:30 +03:00
<h1 align="center">
2020-06-08 21:20:52 +03:00
<img width="300px" src="assets/logo.png" />
2020-03-24 23:40:19 +03:00
2020-07-08 19:52:12 +03:00
[![CI][s0]][l0] [![crates][s1]][l1] ![MIT][s2] [![UNSAFE][s3]][l3] [![ITCH][s4]][l4] [![DISC][s5]][l5] [![TWEET][s6]][l6]
2020-04-03 17:47:30 +03:00
</h1>
2020-03-31 12:41:54 +03:00
2020-03-26 19:34:51 +03:00
[s0]: https://github.com/extrawurst/gitui/workflows/CI/badge.svg
2020-07-04 16:47:06 +03:00
[l0]: https://github.com/extrawurst/gitui/actions
2020-03-24 23:40:19 +03:00
[s1]: https://img.shields.io/crates/v/gitui.svg
[l1]: https://crates.io/crates/gitui
2020-03-23 16:59:46 +03:00
[s2]: https://img.shields.io/badge/license-MIT-blue.svg
2020-04-10 11:52:31 +03:00
[s3]: https://img.shields.io/badge/unsafe-forbidden-success.svg
[l3]: https://github.com/rust-secure-code/safety-dance/
2020-05-07 18:32:33 +03:00
[s4]: https://img.shields.io/badge/itch.io-ok-green
[l4]: https://extrawurst.itch.io/gitui
2020-06-18 11:27:55 +03:00
[s5]: https://img.shields.io/discord/723083834811220028.svg?logo=chat
2020-06-20 10:27:12 +03:00
[l5]: https://discord.gg/7TGFfuq
2020-07-08 19:52:12 +03:00
[s6]: https://img.shields.io/twitter/follow/extrawurst?label=follow&style=social
[l6]: https://twitter.com/intent/follow?screen_name=extrawurst
2020-03-23 16:59:46 +03:00
<h5 align="center">Blazing fast terminal client for git written in Rust</h1>
2020-03-16 19:20:28 +03:00
2020-04-11 12:29:08 +03:00
![](assets/demo.gif)
2020-03-18 02:58:31 +03:00
# Features
2020-05-27 15:03:21 +03:00
- Fast and intuitive **keyboard only** control
- Context based help (**no need to memorize** tons of hot-keys)
- Inspect, commit, and amend changes (incl. hooks: _commit-msg_/_post-commit_)
- Stage, unstage, revert and reset files and hunks
- Stashing (save, apply, drop, and inspect)
2020-09-06 18:48:14 +03:00
- Push to remote
2020-10-18 20:03:11 +03:00
- Branch List (create, rename, delete)
- Browse commit log, diff committed changes
- Scalable terminal UI layout
- Async [input polling](assets/perf_compare.jpg)
- Async git API for fluid control
2020-05-27 15:00:24 +03:00
# Benchmarks
2020-05-27 15:00:24 +03:00
2020-06-17 18:05:34 +03:00
For a [RustBerlin meetup presentation](https://youtu.be/rpilJV-eIVw?t=5334) ([slides](https://github.com/extrawurst/gitui-presentation)) I compared `lazygit`,`tig` and `gitui` by parsing the entire Linux git repository (which contains over 900k commits):
2020-04-10 15:27:27 +03:00
| | Time | Memory (GB) | Binary (MB) | Freezes | Crashes |
| --------- | ----------- | ----------- | ----------- | --------- | --------- |
| `gitui` | **24 s** ✅ | **0.17** ✅ | 1.4 | **No** ✅ | **No** ✅ |
| `lazygit` | 57 s | 2.6 | 16 | Yes | Sometimes |
| `tig` | 4 m 20 s | 1.3 | **0.6** ✅ | Sometimes | **No** ✅ |
2020-04-10 15:27:27 +03:00
# Motivation
2020-03-18 02:58:31 +03:00
I do most of my git usage in a terminal but I frequently found myself using git UIs for some use cases like: index, commit, diff, stash and log.
2020-03-19 19:59:31 +03:00
2020-11-07 23:49:02 +03:00
Over the last 2 years my go-to GUI tool for this was [fork](https://git-fork.com) because it was snappy, free, and not bloated. Unfortunately the _free_ part will [change soon](https://github.com/ForkIssues/TrackerWin/issues/571) and so I decided to build a fast and simple terminal tool to help with features I use the most.
2020-03-18 02:23:06 +03:00
# Known Limitations
2020-06-16 18:00:32 +03:00
2020-09-06 18:48:14 +03:00
- no support for `pull` yet (see [#90](https://github.com/extrawurst/gitui/issues/90))
- no support for [bare repositories](https://git-scm.com/book/en/v2/Git-on-the-Server-Getting-Git-on-a-Server) (see [#100](https://github.com/extrawurst/gitui/issues/100))
- no support for [core.hooksPath](https://git-scm.com/docs/githooks) config
2020-06-16 18:00:32 +03:00
Currently, this tool does not fully substitute the _git shell_, however both tools work well in tandem.
2020-06-16 18:00:32 +03:00
`gitui` currently lacks essential features in git like push, pull, and checkout. The priorities are the basics (add, commit), and on features that are making me mad when done on the _git shell_, like stashes and hunks. Eventually, I will be able to work on features that could lead to making `gitui` a one stop solution to get rid of the shell entirely - but for that I need help - this is just a spare time project right now.
2020-06-16 18:00:32 +03:00
All support is welcomed! Sponsors as well! ❤️
2020-06-16 18:00:32 +03:00
# Installation
2020-06-16 18:00:32 +03:00
For the time being this product is in alpha and is not considered production ready. However, for personal use it is reasonably stable and is being used while developing itself.
2020-04-10 15:27:27 +03:00
### Arch Linux
2020-03-20 04:12:19 +03:00
There is an [AUR package](https://aur.archlinux.org/packages/gitui/) for `gitui`:
2020-05-30 07:55:19 +03:00
```sh
git clone https://aur.archlinux.org/gitui.git
cd gitui
makepkg -si
```
### Fedora
2020-04-28 16:51:24 +03:00
2020-05-28 22:25:34 +03:00
```sh
sudo dnf install gitui
```
2020-04-28 16:51:24 +03:00
2020-11-17 18:45:58 +03:00
### Gentoo
Available in [dm9pZCAq overlay](https://github.com/gentoo-mirror/dm9pZCAq)
```sh
sudo eselect repository enable dm9pZCAq
sudo emerge --sync dm9pZCAq
sudo emerge dev-vcs/gitui::dm9pZCAq
```
### Homebrew (macOS)
2020-04-10 15:27:27 +03:00
```sh
2020-06-16 22:05:34 +03:00
brew install gitui
2020-04-10 15:27:27 +03:00
```
### [Scoop](https://github.com/ScoopInstaller/Main/blob/master/bucket/gitui.json) (Windows)
```
scoop install gitui
```
### [Chocolatey](https://chocolatey.org/packages/gitui) (Windows)
```
choco install gitui
```
## Release Binaries
2020-05-28 22:25:34 +03:00
[Available for download in releases](https://github.com/extrawurst/gitui/releases)
2020-05-28 22:25:34 +03:00
Binaries available for:
2020-03-20 12:37:35 +03:00
- Linux
- macOS
- Windows
2020-03-20 12:37:35 +03:00
# Build
2020-03-20 12:37:35 +03:00
### Requirements
2020-03-24 23:34:11 +03:00
- Latest `rust` and `cargo`
- See [Install Rust](https://www.rust-lang.org/tools/install)
2020-03-20 04:12:19 +03:00
### Cargo Install
2020-03-20 04:12:19 +03:00
The simplest way to start playing around with `gitui` is to have `cargo` build and install it with `cargo install gitui`
2020-03-20 04:12:19 +03:00
# Diagnostics
2020-03-20 04:12:19 +03:00
To run with logging enabled run `gitui -l`.
This will log to:
- macOS: `$HOME/Library/Caches/gitui/gitui.log`
- Linux using `XDG`: `$XDG_CACHE_HOME/gitui/gitui.log`
- Linux: `$HOME/.cache/gitui/gitui.log`
# Color Theme
2020-05-20 13:00:17 +03:00
![](assets/light-theme.png)
`gitui` should automatically work on both light and dark terminal themes.
However, you can customize everything to your liking: See [Themes](THEMES.md).
2020-08-30 13:09:06 +03:00
# Key Bindings
The key bindings can be customized: See [Key Config](KEY_CONFIG.md) on how to set them to `vim`-like bindings.
2021-01-11 19:26:18 +03:00
# Road(map) to 1.0
These are the high level goals before calling out `1.0`:
* upstream branches ([#453](https://github.com/extrawurst/gitui/issues/453))
* force push ([#274](https://github.com/extrawurst/gitui/issues/274))
* simple pull (only for ff-merge) ([#319](https://github.com/extrawurst/gitui/issues/319))
* merging with conflicts ([#485](https://github.com/extrawurst/gitui/issues/485))
* log search (commit, author, sha) ([#449](https://github.com/extrawurst/gitui/issues/449),[#429](https://github.com/extrawurst/gitui/issues/429))
* file history log ([#381](https://github.com/extrawurst/gitui/issues/381))
* more tag support ([#483](https://github.com/extrawurst/gitui/issues/483))
* file blame ([#484](https://github.com/extrawurst/gitui/issues/484))
* visualize branching structure in log tab ([#81](https://github.com/extrawurst/gitui/issues/81))
# Inspiration
2020-03-18 02:58:31 +03:00
- [lazygit](https://github.com/jesseduffield/lazygit)
- [tig](https://github.com/jonas/tig)
- [GitUp](https://github.com/git-up/GitUp)
- It would be nice to come up with a way to have the map view available in a terminal tool
2020-10-10 12:45:56 +03:00
- [git-brunch](https://github.com/andys8/git-brunch)