diff options
| -rw-r--r-- | configs/shared/zsh/aliases.zsh | 3 | ||||
| -rw-r--r-- | configs/shared/zsh/functions.zsh | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/configs/shared/zsh/aliases.zsh b/configs/shared/zsh/aliases.zsh index e86667fc2f3f..9491969c005f 100644 --- a/configs/shared/zsh/aliases.zsh +++ b/configs/shared/zsh/aliases.zsh @@ -131,6 +131,9 @@ alias hgd='hg diff' alias hgsh='hg export' alias hgco='hg update' alias hgls='hg citc --list' # should have different output from `pils` +alias hgrc='hg rebase --continue' +alias hgra='hg rebase --abort' +alias hgconflicts="hg resolve --list 'set:unresolved()'" # much like `gconflicts` # Haskell alias sb="stack build" diff --git a/configs/shared/zsh/functions.zsh b/configs/shared/zsh/functions.zsh index b72ca582d639..4eede030466c 100644 --- a/configs/shared/zsh/functions.zsh +++ b/configs/shared/zsh/functions.zsh @@ -127,7 +127,7 @@ org_capture() { } # Git -conflicts() { +gconflicts() { # Edit git conflicts one-by-one in your favorite editor. ${EDITOR} "$(git status --porcelain | awk '/^UU/ { print $2 }')" } |