![]() ![]() The merge tool can be used to process merge conflicts within a Git repository from the command line.Īfter configuring smerge using the instructions above, run the following from the repository directory: git config 'smerge mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"' git config true git config merge. v or -version: Show version and exit Git Merge Tool Setup h or -help: Show help (this message) and exit b or -background: Don't activate the application Or: smerge mergetool Opens the merge tool for the given files Or: smerge log file Show the file history in the current repository Or: smerge blame file Blame the given file in the current repository Or: smerge search query Search for commits in the current repository Usage: smerge path Open the given repository ![]() Ln -s /opt/sublime_merge/sublime_merge ~/bin/smerge Usage A snappy UI, three-way merge tool, side-by-side diffs, syntax highlighting, and more. However, it won't be if you're using a tarball, so you'll want to add a symlink to sublime_merge named smerge: Meet a new Git Client, from the makers of Sublime Text. Linux: smerge should already be available by default. Ln -s "/Applications/Sublime Merge.app/Contents/SharedSupport/bin/smerge" ~/bin/smerge Assuming you've placed Sublime Merge in the Applications folder, and that you have a ~/bin directory in your path, you can run: Windows: Add C:\Program Files\Sublime Merge to your %PATH% This can be used to open repositories, search, and merge files. Sublime Merge includes a command line tool, smerge, to work with repositories on the command line. ![]() Command Line – Sublime Merge Documentation Download Buy Support News Forum Documentation ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |