git-loom 0.18.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

# abort

Cancel a paused loom operation and restore the repository to its original state.

## Usage

```
git loom abort
```

## When to Use It

When a loom operation is paused due to a conflict and you decide you don't want
to complete it, `loom abort` cancels the operation and rolls back all changes
made so far:

```bash
git loom commit -b feature-auth -m "add auth" zz
# ! Conflicts detected...

git loom abort
# ✓ Aborted `loom commit` and restored original state
```

## What It Does

1. Loads the saved state from `.git/loom/state.json`
2. Aborts the active rebase (if one is in progress)
3. Applies rollback:
   - Hard-resets HEAD to the pre-operation state
   - Restores all branch refs to their pre-operation positions
   - Deletes any branches that were created during the operation
   - Re-applies pre-existing staged changes (if any were saved aside)
   - Re-applies working-tree changes (if any were saved)
4. Deletes the state file
5. Reports success

### Special case: `commit`

After aborting a `commit`, the committed content is returned to the **working
tree as unstaged changes** (via `git reset --mixed`) rather than being
discarded. Your work is preserved; the commit is simply undone.

## Error: No Operation in Progress

```bash
git loom abort
# error: No loom operation is in progress
```

## See Also

- [`continue`](continue.md) — resume instead of cancelling