Features ›

Git

A repository opens as a tab beside your databases and servers. Stage a single hunk, read a commit, push, and resolve a conflict without leaving the window.

Changes, by the hunk

The Changes view lists what is staged and what is not. Select a file to see its diff, then stage or discard it one hunk at a time, or all at once. The diff can be unified or side by side, with changed words highlighted inside each line.

Stage, unstage and discard by hunk, by file, or everything
Untracked files shown or hidden with one switch
Commit with your name and email from your Git config, or amend the last commit
Fetch, pull and push over HTTPS, and switch or create branches

The source control tab: one staged file, four changes, and the diff for cart.js showing hunk 1 of 2 with Stage and Discard

History

History lists recent commits with their authors and dates. Pick one to see the files it changed and the diff for each, in the same viewer as your working changes.

Conflicts, resolved in three columns

When a merge stops on a conflict, right-click the file and choose Resolve Conflicts…. Yours, the result and theirs open side by side; answer each conflict with one click, or type the answer when the right one is a mix of both.

More about the merge window →

The merge window: Yours, Result and Theirs side by side, with both conflicts answered and Save enabled

Careful with your files

Hydra runs Git with go-git compiled into the app, so there is nothing to install and it works under the App Store sandbox. Where go-git and real Git disagree, Hydra follows Git:

Discard All never deletes ignored files. A .env ignored through your global excludes stays where it is
Status is accurate after an editor save. A file replaced rather than rewritten in place is still reported as modified
Switching branches refuses a dirty tree, staged changes included, rather than losing a new file
Unstaging a file leaves it correctly reported as changed

Subversion too

A Subversion checkout opens as a tab of its own, beside your Git repositories: what changed, each file's diff side by side or unified, checkboxes for what goes into a commit, Update, Revert, Add and Mark Resolved, and the history with every revision's changed paths and diff.

Hydra drives the svn command you already have (brew install subversion if not), so your existing checkouts and saved logins keep working. A username and password can come from a Hydra credential instead; the password goes to svn on its standard input, never on its command line. The App Store version cannot run outside tools, so it says so rather than offering a tab that cannot work.

Use Hydra as Git's diff and merge tool

From the Git tab's menu, or one command in Terminal, git difftool and git mergetool open Hydra's windows and wait for you, from any terminal or editor.

hydra git-setup --apply
git mergetool        # opens each conflicted file in Hydra