paulaltin

Sometimes it would be useful to run a subline merge but then manually tweak the result before committing it. For example, given a conflicted hunk where one branch renamed a...

Diff coloring does not work on macOS 13 Ventura

4

Running git-subline-merge in interactive mode on macOS 13 prints this message before each version of a conflicted hunk: ``` diff: unrecognized option `--old-group-format=D%de+%dn,%dE+%dN' usage: diff [-aBbdilpTtw] [-c | -e |...

Add a variable for showing repo name

6

I find that when working with multiple repositories – or especially with git submodules – it can be useful to see in the prompt which one I'm currently in. (This...