Sublime Forum

.gitconfig diff/merge settings

#1

Where do I find the .gitconfig diff/merge integration settings? Also how do I get a list/description of sublime_merge.exe command line arguments?

0 Likes
#2

I’m not sure what you mean here by diff/merge integration settings, but you can get the command line arguments by executing smerge with the --help command line argument:

tmartin:dart:~> smerge --help
Sublime Merge build 1057

Usage: smerge path               Open the given repository
   or: smerge search query       Search for commits in the current repository
   or: smerge blame file [line]  Blame the given file in the current repository
   or: smerge log file           Show the file history in the current repository

  -n or --new-window:      Open a new window
  -b or --background:      Don't activate the application
  -h or --help:            Show help (this message) and exit
  -v or --version:         Show version and exit
0 Likes
#3

External diff/merge tools are not yet supported.

1 Like
#4

Thanks…I was conflating smerge.exe with sublime_merge.exe - looks like smerge.exe is the command line parser and delegates to the main executable (sublime_merge.exe).

1 Like
#5

That explains that. Thanks!

1 Like