Splitting Large Changes with JJ-FZF

by tim-janik 2 months ago

GNU/Linux ◆ xterm-256color ◆ bash 92 views

Splitting Large Changes with JJ

This screencast demonstrates how to handle large changes in the working copy using jj-fzf. It begins by splitting individual files into separate commits (Alt+F), then interactively splits (Alt+I) a longer diff into smaller commits. Diffs can also be edited using the diffedit command (Alt+E) to select specific hunks. Throughout, commit messages are updated with the describe command (Ctrl+D), and all changes can be undone step by step using Alt+Z.

https://github.com/tim-janik/jj-fzf#splitting-large-changes

More by tim-janik

Rebasing Commits 03:16

by tim-janik 1 month ago

JJ-FZF Intro 2 01:17

by tim-janik 1 month ago

Mega-Merge Workflow 03:56

by tim-janik 1 month ago

jj-fzf demo1 02:02

by tim-janik 5 months ago

See all

You can download this recording in asciicast v2 format, as a .cast file.

Download

Replay in terminal

You can replay the downloaded recording in your terminal using the asciinema play command:

asciinema play 682905.cast

If you don't have asciinema CLI installed then see installation instructions.

Use with stand-alone player on your website

Download asciinema player from the releases page (you only need .js and .css file), then use it like this:

<!DOCTYPE html>
<html>
<head>
  <link rel="stylesheet" type="text/css" href="asciinema-player.css" />
</head>
<body>
  <div id="player"></div>
  <script src="asciinema-player.min.js"></script>
  <script>
    AsciinemaPlayer.create(
      '/assets/682905.cast',
      document.getElementById('player'),
      { cols: 122, rows: 34 }
    );
  </script>
</body>
</html>

See asciinema player quick-start guide for full usage instructions.

While this site doesn't provide GIF conversion at the moment, you can still do it yourself with the help of asciinema GIF generator utility - agg.

Once you have it installed, generate a GIF with the following command:

agg https://asciinema.org/a/682905 demo.gif

Or, if you already downloaded the recording file:

agg demo.cast demo.gif

Check agg --help for all available options. You can change font family and size, select color theme, adjust speed and more.

See agg manual for full usage instructions.