|
|
|
@ -16,6 +16,8 @@ alias hgs='hg status' |
|
|
|
alias hgsl='hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n" ' |
|
|
|
alias hgsl='hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n" ' |
|
|
|
# this is the 'git commit --amend' equivalent |
|
|
|
# this is the 'git commit --amend' equivalent |
|
|
|
alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip' |
|
|
|
alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip' |
|
|
|
|
|
|
|
# list unresolved files (since hg does not list unmerged files in the status command) |
|
|
|
|
|
|
|
alias hgun='hg resolve --list' |
|
|
|
|
|
|
|
|
|
|
|
function in_hg() { |
|
|
|
function in_hg() { |
|
|
|
if [[ -d .hg ]] || $(hg summary > /dev/null 2>&1); then |
|
|
|
if [[ -d .hg ]] || $(hg summary > /dev/null 2>&1); then |
|
|
|
|