Description

Merge Conflicts

Resolve your merge-conflicts easily using the merge-conflict helper and built-in merge-conflict resolver.

Interactive Rebase

Edit, reorder and squash your commits using visual interactive rebase.

History

With history view you can find all commits where a particular file or directory was changed.

Blame

With blame view you can find the last commit which changed a particular file line.

Basic features

Fetch, pull, push

Commit, amend

Create and delete branches and tags

Create and delete remote repos

Checkout branch or revision

Cherry-pick

Revert

Merge

Rebase

Stashes

Submodules

Additional Information