giff 1.2.0

Visualizes the differences between the current HEAD and a specified branch in a git repository using a formatted table output in your terminal. The differences are displayed with color-coded additions and deletions for better readability.
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122

<div align="center">

# giff

**A terminal UI for git diffs with interactive rebase support.**

[![CI](https://github.com/bahdotsh/giff/actions/workflows/ci.yml/badge.svg)](https://github.com/bahdotsh/giff/actions/workflows/ci.yml)
[![Crates.io](https://img.shields.io/crates/v/giff.svg)](https://crates.io/crates/giff)
[![License](https://img.shields.io/crates/l/giff.svg)](LICENSE)

![giff demo](assets/demo.gif)

</div>

---

## Features

- **Side-by-side & unified diffs** — toggle between layouts with a single key
- **Syntax highlighting** — language-aware coloring for 130+ languages via syntect
- **Dark & light themes** — built-in themes with full customization through config
- **Interactive rebase** — accept or reject individual changes, then commit
- **Rebase detection** — notifies you when your branch is behind or has diverged
- **Vim-style navigation** — keyboard-first with mouse scroll support
- **Help overlay** — press `?` anywhere to see all keybindings in context
- **Configurable** — persistent settings via `~/.config/giff/config.toml`

### Syntax highlighting

![Rust syntax highlighting](assets/syntax-highlight.png)

### Unified view

![Unified diff view](assets/unified-view.png)

### Light theme

![Light theme](assets/light-theme.png)

### Help overlay

![Help overlay](assets/help-overlay.png)

## Install

```bash
cargo install giff
```

Or build from source:

```bash
git clone https://github.com/bahdotsh/giff.git
cd giff && cargo build --release
```

## Usage

```bash
giff                        # uncommitted changes vs HEAD
giff main feature-branch    # diff between two refs
giff main                   # diff ref against working tree
giff --theme light          # override theme
giff -d "--stat"            # pass custom git diff args
giff --auto-rebase          # auto-rebase if behind upstream
```

## Keybindings

### Diff mode

| Key | Action |
|---|---|
| `j` / `k` | Navigate down / up |
| `PageDown` / `PageUp` | Page down / up |
| `Home` / `End` | Jump to first / last item |
| `Tab` | Toggle focus between file list and diff |
| `h` / `l` | Focus file list / diff content |
| `u` | Toggle unified / side-by-side view |
| `t` | Toggle dark / light theme |
| `r` | Enter rebase mode |
| `?` | Show help |
| `q` / `Esc` | Quit |

### Rebase mode

| Key | Action |
|---|---|
| `j` / `k` | Next / previous change |
| `a` / `x` | Accept / reject change |
| `n` / `p` | Next / previous file with changes |
| `c` | Commit accepted changes |
| `?` | Show help |
| `Esc` | Cancel rebase |

### Mouse

Scroll wheel works in both the file list and diff panes.

## Configuration

`~/.config/giff/config.toml`

```toml
theme = "dark"

[themes.custom]
base = "dark"
accent = "#89b4fa"
fg_added = "#a6e3a1"
fg_removed = "#f38ba8"
```

See the built-in dark and light themes in [`src/ui/theme.rs`](src/ui/theme.rs) for all available color keys.

## Contributing

Contributions welcome — feel free to open an issue or submit a PR.

## License

[MIT](LICENSE) or [Unlicense](LICENSE), at your option.