Merge remote-tracking branch 'robbyrussell_original_master/master'

This commit is contained in:
Stéphane GAUTIER 2012-03-02 08:39:57 +01:00
commit 7ac349baf8
36 changed files with 392 additions and 160 deletions

View file

@ -48,15 +48,15 @@ function update_current_hg_vars(){
}
# 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'