rebase-editor

Simple terminal based sequence editor for git interactive rebase. Written in Node.js, published to npm, uses terminal-kit.

VERSION 2.0 IS OUT :sparkles: :camel: :boom: New features: Select multiple lines, and undo changes, update-ref, rebase-merges! Check the changelog for details.

Install

 npm install -g rebase-editor
 git config --global sequence.editor rebase-editor

NOTE: Also works with Yarn: yarn global add rebase-editor

Usage

The terminal prints out the standard interactive rebase file that git creates, plus some extra command info in the comments. When using the standard commands, the current lines action changes to the corresponding action:

Commands:

• p, pick = use commit
• r, reword = use commit, but edit the commit message
• e, edit = use commit, but stop for amending
• s, squash = use commit, but meld into previous commit
• f, fixup = like "squash", but discard this commit's log message
• b, break = stop here (continue rebase later with git rebase --continue)
• d, drop = remove commit

NOTE: x, exec command is not supported

Supported extra commands are:

• DOWN/UP = Moves cursor between lines
• SHIFT_RIGHT/SHIFT_DOWN = Select one line down
• SHIFT_LEFT/SHIFT_UP = Select one line up
• RIGHT/CTRL_DOWN = Moves current line down one position
• LEFT/CTRL_UP = Moves current line up one position
• HOME/END/PAGE_UP/PAGE_DOWN = Moves cursor and selects with SHIFT
• z, CTRL_Z = Undo
• Z, CTRL_SHIFT_Z = Redo
• ENTER, q = Save and quit
• ESC, CTRL_C = Abort

To use a different editor for one time only you can use the GIT_SEQUENCE_EDITOR environment variable (replace vi with your favorite editor):

GIT_SEQUENCE_EDITOR="vi" git rebase -i master

Command line arguments

The editor accepts the following command line arguments:

• -s, --status: Print a status line on top. Useful for debugging custom key maps.
• -k, --keys: Set a custom keybinding. Must be defined as .json file or a .js file with a module exporting a json object.
• -c, --color: Use colorful editor output. This argument takes an extra optional argument with custom colors as a comma separated string of terminal-kit style characters. You can specify 3 colors, first for the line action ('pick', 'squash', etc.), the second for the hash and the third for the message. An empty string means no special color. Ex. (-c ^r,^y,^b (red, yellow, blue) or -c ^r (Only color action) or -c ,,^b (Only color message))
• -m, --marker: Set a custom marker to mark selected lines. It can be any string like '>> ' or one of the terminal-kit style characters. The default is '^!' (Inverse) except for windows where that doesn't work (See #9) which has yellow instead: '^Y'.
• --no-alternate-screen: Disable alternate screen. (See #11)

  git config --global sequence.editor "rebase-editor -s -c -m '> ' -k ~/.rebase-editor-keybindings.json --"

NOTE: When using command line arguments the command should end with -- to separate custom arguments from the filename of the rebase file

Custom key bindings

The keybindings must be a file that can be required, either JSON or a node module that exports a simple object. The specials keys that are supported are defined by terminal-kit.

Default key bindings

{
  "UP": "up",
  "DOWN": "down",
  "LEFT": "moveUp",
  "CTRL_UP": "moveUp",
  "RIGHT": "moveDown",
  "CTRL_DOWN": "moveDown",
  "END": "end",
  "HOME": "home",
  "PAGE_DOWN": "pageDown",
  "PAGE_UP": "pageUp",
  "SHIFT_UP": "selectUp",
  "SHIFT_DOWN": "selectDown",
  "SHIFT_LEFT": "selectUp",
  "SHIFT_RIGHT": "selectDown",
  "SHIFT_PAGE_DOWN": "selectPageDown",
  "SHIFT_PAGE_UP": "selectPageUp",
  "SHIFT_HOME": "selectHome",
  "SHIFT_END": "selectEnd",
  "p": "pick",
  "r": "reword",
  "e": "edit",
  "s": "squash",
  "f": "fixup",
  "d": "drop",
  "BACKSPACE": "drop",
  "DELETE": "drop",
  "z": "undo",
  "CTRL_Z": "undo",
  "Z": "redo",
  "CTRL_SHIFT_Z": "redo",
  "q": "quit",
  "ENTER": "quit",
  "CTRL_C": "abort",
  "ESCAPE": "abort"
}

A note on key bindings for Mac

Not all key combinations work on Mac by default. Most notably, no modifier keys work with UP/DOWN (Like SHIFT, CTRL, ALT, META/CMD). Fn works kind of but it translates to PAGE_UP/DOWN. Therefor I decided to use the LEFT/RIGHT combinations as a fallback for Mac. You can however configure your terminal manually. See #8 for a guide how to do that.

Likewise CMD-Z, CMD-SHIFT-Z does not work either(CMD doesn't work at all really). So I went with simply z,Z for undo redo.

Does it work on...

| Platform | Support | | -------- | ------- | | Mac | Yes | | Linux | Yes | | Windows | Yes, but not Git Bash (#7) |

Made a mistake?

git reflog is your friend:

Uninstall

npm remove -g rebase-editor
git config --global --unset sequence.editor

Yarn: yarn global remove rebase-editor

Development

Testing

npm test or npm run tdd

For debugging I have a test file I have been using.

node index.js example

For debugging using git:

GIT_SEQUENCE_EDITOR="./index.js" git rebase -i master

Changelog

v1.0.0

Initial version

v2.0.0

Complete rewrite with new architecture and test driven implementation.

New features:

• Line selection. You can now select multiple lines and move or change them together. Use Shift up/down (not on mac), or Shift left/right to make a selection.
• Highligt line. The selected line(s) is now highlighted.
• Support the drop command instead of deleting lines.
• Undo/Redo. You can now undo and redo all changes with z,Z or CTRL_Z, CTRL_SHIFT_Z.
• Custom colors. You can customize the colors using the -c attribute.

Breaking changes:

• Colors is now opt-in instead of opt-out. With the new line selection I like no colors better.
• Removed cut'n paste function. Replaced with drop command.
• Changed default move line key from u and d to CTRL_UP/CTRL_DOWN (not on mac) or LEFT/RIGHT. Can be reverted with custom keymap.

v2.0.5

New features

• support HOME, END, PAGE_UP and PAGE_DOWN

v2.0.6, v2.0.7

New features

• support break. Adds a new line with a break. To remove the line you can drop it.

v2.0.8

New features

• support --update-refs. You can now move around and drop update-ref lines.
• support --rebase-merges. You can now move around and drop label, reset and merge lines.

v2.0.9

Bugfix

• branch comments was not put inline.

TODO

• [ ] Support exec command
• [ ] Add and edit label, reset, merge, update-refs commands

Or not.. I have never found use for this function anyways, and I'm not sure how I would like the workflow and keymapping to work.

Contributions

Contributions and comments are welcome, just make an issue and/or pull req.

To get started just clone the repo and run npm install

To test manually using an example file in the repo: ./index.js example

To test manually using git: GIT_SEQUENCE_EDITOR=./index.js git rebase -i HEAD^^^

Make sure to run the test npm test and check the testing coverage npm run cover before you create a pr. I do have full test coverage and would like to keep it like that.

Credits

Thanks to Node.js and the wonderful terminal-kit project. Also thanks to @perlun and @real-yfprojects for contributing.

See also

There is also git-interactive-rebase-tool, a similar tool written in Rust.