Merge commits using git-rebase

by psachin 8 years ago

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

Lets see how git-rebase can be used to merge two commits.

I have git tree where last two commit are nearly the same. I need to merge them together::

b835d5bd21cc - Sachin Patil, 34 minutes ago : Fixed: No timestamp while system reservation 7a8a7f1cee9e - Sachin Patil, 7 days ago : Fixed: No timestamp while system reservation

pick stands for use the commit as the base commit
squash merge that commit(s) to base commit
Lets pick 7a8a7f1cee9e as a base commint and merge b835d5bd21cc to it
Press s to squash b835d5bd21cc
Now save-quit the buffer(This depends on the editor you use).
After saving changes, the new buffer gives you a chance to enter or alter commit message. When done with commit message, save & quit the buffer.
Finally check out the new tree, you should have single commit. Notice new commit hash

More by psachin

Setup Git for OpenStack development 03:24

by psachin 8 years ago

setv 2.0 supports ZSH 01:04

by psachin 3 years ago

Swift All In One on Fedora 10:42

by psachin 8 years ago

tss 03:30

by psachin 8 years ago

See all

You can download this recording in asciicast v1 format, as a .json file.

Download

Replay in terminal

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

asciinema play 90737.json

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/90737.json',
      document.getElementById('player'),
      { cols: 107, rows: 32 }
    );
  </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/90737 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.