Git Extensions¶

Git Extensions is a toolkit to make working with Git on Windows more intuitive. The shell extension will intergrate in Windows Explorer and presents a context menu on files and directories. There is also a Visual Studio plugin to use git from Visual Studio. Sourcecode: https://github.com/spdr870/gitextensions/tree/master

Features¶

• Windows Explorer intergration for Git
• Visual Studio (2005/2008/2010) plugin for Git
• Feature rich user interface for Git
• Single installer installs Git, GitExtensions and the mergetool KDiff3
• 32bit and 64bit support!

Video tutorial¶

• 1 Clone - Git Extensions - https://www.youtube.com/watch?v=TlZXSkJGKF8
• 2 Commit changes - https://www.youtube.com/watch?v=B8uvje6X7lo
• 3 Push changes - https://www.youtube.com/watch?v=JByfXdbVAiE
• 4 Pull changes - https://www.youtube.com/watch?v=9g8gXPsi5Ko
• 5 Handle merge conflicts - https://www.youtube.com/watch?v=Kmc39RvuGM8

Log¶

View commit log¶

The full commit history can be browsed. There is a graph that shows branches.

Search history¶

The history can be searched using regular expressions are simple search terms.

View file history¶

There is a single file history viewer that shows all revisions of a single file and the changes.

Blame¶

There is a blame function in the file history browser. It shows the last person editing a single line. Double clicking on a code line shows the full commit introducing the change.

View commit differences¶

The changes made in a single commit can be viewed using the diff viewer.

Commit¶

Commit changes¶

Commit changes using the commit dialog. Single files can be staged and unstaged. It is also possible to amend this commit to the last commit.

Cherry pick commit¶

Recommit a commit using cherry pick.

Patches¶

Format patch¶

Format a single patch or patch serie using the format patch dialog.

Apply patches¶

Apply a single patch or all patches in a directory.

Handle merge conflicts¶

Merge conflicts are shown and can be resolved using the configured mergetool. There is buildin support for P4Merge, Kdiff3 and TortoiseMerge. Othere mergetools can be configured manually in the settings dialog.

When you are in the middle of a mergeconflict or unfinished task, you will be warned.

Mergetool p4merge¶

Mergetool p4merge in action.

Remote features¶

Clone¶

Repositories can be cloned very easy.

Pull changes¶

Pull or fetch changes from a remote repository.

Manage remote repositories (full SSH support)¶

Edit and add remote repositories using this dialog. You can enter a private SSH key for each remote repository and it will be automaticly loaded when communication the remote.

Settings¶

Settings dialog with auto-configure¶

All critical settings can be configured using the settings dialog. When a setting is not configured correct, it can be fixed automaticly.

Intergration¶

Visual Studio plugin¶

There is Visual Studio intergration for Visual Studio 2005 and Visual Studio 2008.

Shell Extensions¶

The Shell Extensions integration will make new options available in Windows Explorer and 3rd party file browsers like Total Commander.

Command line¶

Most features can be runned from the commandline. It is recommended to add GitExtensions to the path when using from the command line.

The following functions are available:

• Add files
• Apply patches
• Archive
• Create branches/tags
• Checkout branches/tags/revisions
• Merge branches
• Rebase
• Commit changes
• Stash changes, with multiple stash support
• Clone repositories
• Push
• Pull
• SSH support
• All Git remote features
• Init new repository
• Single file history
• Full development history
• Difference reports
• Browsing repository
• Support for external mergetools