Git Extensions Documentation

https://git-extensions-documentation.readthedocs.io/en/release-6.0/
Admin
This repository provides the official documentation and manual for Git Extensions version 6.0,...
Tokens:18,369
Snippets:385
Trust Score:9.6
Update:3 months ago
Show doc for...
Tokens:
Raw
### Get command help

Source: https://git-extensions-documentation.readthedocs.io/en/release-6.0/_sources/z_appendix.rst.txt

Opens the manual page for a specific Git command.

```bash
$ git <command> --help
```

--------------------------------

### Manual Settings XML Syntax

Source: https://git-extensions-documentation.readthedocs.io/en/release-6.0/_sources/manual_settings.rst.txt

The required XML structure for adding custom settings to the GitExtensions.settings file.

```xml
<item>
    <key>
      <string>SETTING_KEY</string>
    </key>
    <value>
      <string>SETTING_VALUE</string>
    </value>
  </item>
```

--------------------------------

### Solve merge conflicts

Source: https://git-extensions-documentation.readthedocs.io/en/release-6.0/_sources/z_appendix.rst.txt

Launches the configured merge tool to resolve conflicts, followed by a commit.

```bash
$ git mergetool
```

```bash
$ git commit
```

--------------------------------

### Configure Difftastic display mode

Source: https://git-extensions-documentation.readthedocs.io/en/release-6.0/_sources/settings.rst.txt

Override Git Extensions settings by defining the display mode in the Git difftool configuration.

```ini
[difftool "difftastic"]
    cmd = /c/Downloads/bin/difft.exe --display="side-by-side-show-both" "$LOCAL" "$REMOTE"
```

--------------------------------

### Configure Difftastic in .gitconfig

Source: https://git-extensions-documentation.readthedocs.io/en/release-6.0/_sources/settings.rst.txt

Add this configuration to your .gitconfig file to enable the Difftastic structural diff tool.

```ini
[difftool "difftastic"]
    cmd = /c/temp/bin/difft.exe "$LOCAL" "$REMOTE"
```

--------------------------------

### Pull changes from remote

Source: https://git-extensions-documentation.readthedocs.io/en/release-6.0/_sources/z_appendix.rst.txt

Fetches and merges changes from a specified remote repository and branch.

```bash
$ git pull c:/demo1 master
```

--------------------------------

### Apply stashed changes

Source: https://git-extensions-documentation.readthedocs.io/en/release-6.0/_sources/z_appendix.rst.txt

Applies the most recent stash to the current working directory.

```bash
$ git stash apply
```

--------------------------------

### Override Git Color Configuration

Source: https://git-extensions-documentation.readthedocs.io/en/release-6.0/settings.html

Use this command to override the color for added text using Git configuration.

```bash
git config –global color.diff.new “#000000 #c8ffc8”
```

--------------------------------

### Push changes to remote

Source: https://git-extensions-documentation.readthedocs.io/en/release-6.0/_sources/z_appendix.rst.txt

Pushes local commits to the specified remote repository.

```bash
$ git push c:/demo1
```
Tokens:
Raw