Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Ohmyzsh
Commits
d5dc9f71
Unverified
Commit
d5dc9f71
authored
4 years ago
by
Amir Masoud Abdol
Committed by
GitHub
4 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Add sublime-merge plugin (#7228)
parent
1617f4ff
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
plugins/sublime-merge/README.md
+17
-0
plugins/sublime-merge/README.md
plugins/sublime-merge/sublime-merge.plugin.zsh
+55
-0
plugins/sublime-merge/sublime-merge.plugin.zsh
with
72 additions
and
0 deletions
+72
-0
plugins/sublime-merge/README.md
0 → 100644
View file @
d5dc9f71
## sublime-merge
Plugin for Sublime Merge, a cross platform text and code editor, available for Linux, Mac OS X, and Windows.
### Requirements
*
[
Sublime Merge
](
https://www.sublimemerge.com
)
### Usage
*
If
`sm`
command is called without an argument, launch Sublime Merge
*
If
`sm`
is passed a directory,
`cd`
to it and open the existing git repository in Sublime Merge
*
If
`smt`
command is called, it is equivalent to
`sm .`
, opening the existing git repository in the current folder in Sublime Merge
*
If
`ssm`
command is called, it is like
`sudo sm`
, opening the git repository in Sublime Merge. Useful for editing system protected repositories.
\ No newline at end of file
This diff is collapsed.
Click to expand it.
plugins/sublime-merge/sublime-merge.plugin.zsh
0 → 100644
View file @
d5dc9f71
# Sublime Merge Aliases
()
{
if
[[
"
$OSTYPE
"
==
linux
*
]]
;
then
local
_sublime_linux_paths
_sublime_linux_paths
=(
"
$HOME
/bin/sublime_merge"
"/opt/sublime_merge/sublime_merge"
"/usr/bin/sublime_merge"
"/usr/local/bin/sublime_merge"
"/usr/bin/sublime_merge"
"/usr/local/bin/smerge"
"/usr/bin/smerge"
)
for
_sublime_merge_path
in
$_sublime_linux_paths
;
do
if
[[
-a
$_sublime_merge_path
]]
;
then
sm_run
()
{
$_sublime_merge_path
"
$@
"
>
/dev/null 2>&1 &|
}
ssm_run_sudo
()
{
sudo
$_sublime_merge_path
"
$@
"
>
/dev/null 2>&1
}
alias
ssm
=
ssm_run_sudo
alias
sm
=
sm_run
break
fi
done
elif
[[
"
$OSTYPE
"
=
darwin
*
]]
;
then
local
_sublime_darwin_paths
_sublime_darwin_paths
=(
"/usr/local/bin/smerge"
"/Applications/Sublime Merge.app/Contents/SharedSupport/bin/smerge"
"
$HOME
/Applications/Sublime Merge.app/Contents/SharedSupport/bin/smerge"
)
for
_sublime_merge_path
in
$_sublime_darwin_paths
;
do
if
[[
-a
$_sublime_merge_path
]]
;
then
subm
()
{
"
$_sublime_merge_path
"
"
$@
"
}
alias
sm
=
subm
break
fi
done
elif
[[
"
$OSTYPE
"
=
'cygwin'
]]
;
then
local
sublime_merge_cygwin_paths
sublime_merge_cygwin_paths
=(
"
$(
cygpath
$ProgramW6432
/Sublime
\
Merge
)
/sublime_merge.exe"
)
for
_sublime_merge_path
in
$_sublime_merge_cygwin_paths
;
do
if
[[
-a
$_sublime_merge_path
]]
;
then
subm
()
{
"
$_sublime_merge_path
"
"
$@
"
}
alias
sm
=
subm
break
fi
done
fi
}
alias
smt
=
'sm .'
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help