Git workflow

Ingot ships IDE-grade Git tools as tool windows and dialogs, so you rarely need a terminal for everyday version control.

Commit

Open the Commit tool window with ⌘K (Ctrl+K), or ⌘0 (Alt+0) to toggle it.

Changelists and unversioned files, with include / exclude per file and per hunk
Amend and sign-off options
Commit message history: ⌘⌥H (Ctrl+Alt+H)
Show Diff ⌘D, Jump to Source F4, Commit ⌘↩, Rollback ⌘⌥Z, Refresh ⌘R

The Commit tool window: changelist, unversioned files, commit message and options.

Push

⇧⌘K (Ctrl+Shift+K) opens the Push dialog, which lists exactly which commits go to which remote branch before anything leaves your machine.

Annotate with Git Blame

Click the line-number gutter (or run Annotate with Git Blame from Find Action, ⌘⇧A). Each line shows its date and author, shaded by age.

Hover a line to see its commit.
Click to open the details dialog: the commit, the line's history, Annotate Previous Revision and Show in Git Log.

Annotate with Git Blame: author and date per line, then commit details with the line's history.

Line history

From the details dialog, follow a line back through every commit that touched it, or annotate the revision before a change to see what it replaced.

Git log

The Git tool window (⌘9 / Alt+9) shows branches and the commit graph.

Merge conflicts

Conflicts open a three-pane merge: Yours | Result | Theirs, with buttons to take either side per conflict and navigation between conflicts. An AI suggestion is offered as a diff you can take or leave.