Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Oh My Zsh
Commits
c1c7b0e4
Commit
c1c7b0e4
authored
Sep 26, 2011
by
Dan Shearmur
Browse files
added git merge as gm
parent
762b55bb
Changes
1
Show whitespace changes
Inline
Side-by-side
plugins/git/git.plugin.zsh
View file @
c1c7b0e4
...
@@ -33,6 +33,8 @@ alias gss='git status -s'
...
@@ -33,6 +33,8 @@ alias gss='git status -s'
compdef _git
gss
=
git-status
compdef _git
gss
=
git-status
alias
ga
=
'git add'
alias
ga
=
'git add'
compdef _git
ga
=
git-add
compdef _git
ga
=
git-add
alias
gm
=
'git merge'
compdef _git
gm
=
git-merge
# Git and svn mix
# Git and svn mix
alias
git-svn-dcommit-push
=
'git svn dcommit && git push github master:svntrunk'
alias
git-svn-dcommit-push
=
'git svn dcommit && git push github master:svntrunk'
...
...
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