sublime_merge

sublime_merge copied to clipboard

**Problem description** It is currently not possible to edit the message of a stash (commit). SM allows entering edit mode for a stash commit but when trying to submit the...

FichteFoll

Ability to bookmark branches

1

An option to bookmark/pin branches so they appear at the top of the branches list would be great When a project has a lot of branches it would be good...

NtTestAlert

Overridden username and email are not used when editing a commit message

2

**Version info** - OS: Windows 10 19044.3086 - Build: 2092 **Description** When a username and an email are overridden with `includeIf` in Git config, editing a commit message applies the...

Devenec

There are ANSI escape sequences in the command output

5

**Version info** - OS: Win7 x64 - Build: 2024 **Description** There are ANSI escape sequences in the command output.  **Steps to reproduce** Steps to reproduce the behavior: 1. Set...

jfcherng

Making the process of doing three-way merge more convenient

2

**Problem description** Sometimes while in the middle of resolving merge conflicts for a file, I want to know the history/commit that led to a conflict in a hunk. But because...

ajitid

Incorrect syntax highlighting in diff window

1

**Version info** - OS: Windows 10 - Build: 2091 Incorrect syntax highlighting when using "Raw string literal text" with String interpolation using $ in C# https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/tokens/raw-string https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/tokens/interpolated **Steps to reproduce**...

IskanderSitdikov

Add support for git-absorb

1

**Problem description** One of the best features of Meta's version control system is the ability to use `absorb`. This finds the right commit on your branch to apply changes in...

dsp

Active branches displays greyed

1

**Version info** - OS: [macOS 14.2.1] - Build: [2091] **Description** Sometimes the local branches show grayed out when I actually checked out on them. **Steps to reproduce** Checkout to branch...

qubiq1337

Diff/Merge on non-git files

29

**Problem description** There is no diff/merge tool with proper syntax highlighting like SublimeMerge, but it can only works in a git environment. There is a lot of non-git cases where...

TheClams

Allow for diffing arbitrary directories or files

1

In #40 @dpjohnst suggested creating a new issue for this enhancement request. **Problem description** Most merge tools also support arbitrary diffing like `tool file1 file2` or `tool folder1 folder2`. It...

dakira