git-loom 0.25.0

A Git CLI tool that weaves together multiple feature branches into integration branches
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
123
124
125
126
127
128
129
130
131
132

# diff

Show a diff using short IDs, like `git diff`.

## Usage

```
git loom diff [args...] [--staged] [--all] [-- <git args>...]
```

Alias: `di`

Each argument is a file, commit, or commit range. Arguments can be mixed freely in a single invocation.

### Arguments

| Argument | Description |
|----------|-------------|
| `[args...]` | Files (short ID or path), commits (short ID, hash), or ranges (`left..right`) |

### Options

| Option | Description |
|--------|-------------|
| `--staged` (alias `--cached`) | Show staged changes (index vs `HEAD`) |
| `-a`, `--all` | Show all changes, staged and unstaged combined (working tree vs `HEAD`) |

`--staged` and `--all` are mutually exclusive. With neither flag, only unstaged changes are shown, exactly like `git diff`.

### Git Options

Everything after a `--` separator goes to `git diff` untouched — see [Passing Options to Git](README.md#passing-options-to-git):

```bash
git loom diff -- --stat
git loom diff ma -- -w
git loom diff osy..mqt -- --name-only
git loom diff -- -a            # git's --text; loom's own -a is --all
```

## What It Does

### When No Arguments Are Given

Shows unstaged changes in the working tree — identical to `git diff` with no arguments. Use `--staged` to show staged changes instead, or `--all` to show both.

### When a Commit Is Given

Resolves the token to a full hash and passes it to `git diff`, showing the diff between that commit and the working tree.

### When a File Is Given

Resolves the token to a file path and runs `git diff -- <path>`, showing unstaged changes to that file. With `--staged` the staged changes are shown (`git diff --staged -- <path>`); with `--all` both are shown (`git diff HEAD -- <path>`).

### When a Commit Range Is Given

Tokens of the form `left..right` are resolved on each side and forwarded to `git diff`. Branch names, `HEAD`, and tags that can't be resolved as short IDs are passed through to git unchanged, so all standard range forms work:

```bash
git loom diff HEAD~3..HEAD
git loom diff main..HEAD
git loom diff osy..rsv
```

### When a Commit and a File Are Both Given

The commit is placed before `--` and the file after, limiting the diff to that file at that commit.

## Target Resolution

Single tokens (not ranges) are resolved in this order:

1. **Files** — short ID or repository-relative path (checked before commits)
2. **Commits** — short ID, partial hash, or full hash

Range endpoints use lenient resolution: if a token cannot be resolved as a short ID or hash it is passed to git as-is, allowing `HEAD`, branch names, and tags.

## Examples

### Show unstaged changes

```bash
git loom diff
# Equivalent to: git diff
```

### Show staged changes

```bash
git loom diff --staged
# Equivalent to: git diff --staged
```

### Show all changes, staged and unstaged

```bash
git loom diff --all
# Equivalent to: git diff HEAD
```

### Diff a commit by short ID

```bash
git loom diff osy
# Shows the diff between commit "osy" and the working tree
```

### Diff a file by short ID

```bash
git loom diff ma
# Shows unstaged changes to the file with short ID "ma"
```

### Diff a commit range

```bash
git loom diff osy..mqt
# Shows what changed between those two commits
```

### Limit diff to a file at a specific commit

```bash
git loom diff osy ma
# Equivalent to: git diff <hash-of-osy> -- src/auth/login.rs
```

## Prerequisites

- A non-bare git repository.
- For short IDs: upstream tracking configured on the current branch (same as `git loom status`).