diff options
author | Sébastien M-B <essembeh@gmail.com> | 2012-04-12 19:28:59 +0200 |
---|---|---|
committer | Sébastien M-B <essembeh@gmail.com> | 2012-04-12 19:28:59 +0200 |
commit | 741388be00fb88b7680e0faa328adf5a86e1f65f (patch) | |
tree | 5e53a65fcc71bc01c5f81b28fb5e54faaf3ab2a8 /plugins/mercurial | |
parent | 37266112759a5759536cc4ea84ea063695cd1f2e (diff) | |
parent | 1120f973054836eeb53750f57d69fbec41a340dc (diff) | |
download | zsh-741388be00fb88b7680e0faa328adf5a86e1f65f.tar.gz zsh-741388be00fb88b7680e0faa328adf5a86e1f65f.tar.bz2 zsh-741388be00fb88b7680e0faa328adf5a86e1f65f.zip |
Merge remote branch 'upstream/master'
Conflicts:
lib/completion.zsh
Diffstat (limited to 'plugins/mercurial')
-rw-r--r-- | plugins/mercurial/mercurial.plugin.zsh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh index 2988f0a46..caf0d9efc 100644 --- a/plugins/mercurial/mercurial.plugin.zsh +++ b/plugins/mercurial/mercurial.plugin.zsh @@ -1,14 +1,14 @@ # Mercurial -alias hgc='hg commit -v' -alias hgb='hg branch -v' +alias hgc='hg commit' +alias hgb='hg branch' alias hgba='hg branches' alias hgco='hg checkout' alias hgd='hg diff' alias hged='hg diffmerge' # pull and update -alias hgl='hg pull -u -v' -alias hgp='hg push -v' -alias hgs='hg status -v' +alias hgl='hg pull -u' +alias hgp='hg push' +alias hgs='hg status' # this is the 'git commit --amend' equivalent alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip' |