summaryrefslogtreecommitdiff
path: root/.zsh/functions/cci
diff options
context:
space:
mode:
Diffstat (limited to '.zsh/functions/cci')
-rw-r--r--.zsh/functions/cci10
1 files changed, 5 insertions, 5 deletions
diff --git a/.zsh/functions/cci b/.zsh/functions/cci
index 5693440..dc46f23 100644
--- a/.zsh/functions/cci
+++ b/.zsh/functions/cci
@@ -52,17 +52,17 @@ else
echo "$(config status)"
ask || return 2
- config add -u
+ config add --update
fi
-cstg diff -O --cached
+cstg diff --diff-opts --cached
ask || return 2
log "Creating new patch"
cstg new $tok -m "$message"
log "Refreshing"
-cstg refresh -i
+cstg refresh --index
if [[ -z $(cstg files) ]]; then
echo
@@ -79,7 +79,7 @@ cstg commit $tok || return
# this is needed to make the `config push` work
if is-at-least 0.16 $stg_v; then
log "Popping patches, stg thought it had to re-apply"
- cstg pop -a -k || return
+ cstg pop --all --keep || return
fi
if [[ -n $(cstg series --applied) ]]; then
@@ -93,7 +93,7 @@ log "Pushing to remote"
config push || return
log "Re-apply patches"
-cstg push -a -k || return
+cstg push --all --keep || return
log "Done"