diff options
| author | René Neumann <rene.neumann@in.tum.de> | 2012-10-01 17:55:08 +0200 |
|---|---|---|
| committer | René Neumann <rene.neumann@in.tum.de> | 2012-10-01 17:55:09 +0200 |
| commit | 72dd6d54758d3af1c00cd631bf7d623b4cfb0b53 (patch) | |
| tree | ac161ade79b5d1d9633f45be88c597162c639ee5 /.zsh | |
| parent | 2fd164ea77b6153b096a135db8f493be8e5f4573 (diff) | |
| download | dotfiles-72dd6d54758d3af1c00cd631bf7d623b4cfb0b53.tar.gz dotfiles-72dd6d54758d3af1c00cd631bf7d623b4cfb0b53.tar.bz2 dotfiles-72dd6d54758d3af1c00cd631bf7d623b4cfb0b53.zip | |
Use long option-names -- adds documentation in itself
Diffstat (limited to '.zsh')
| -rw-r--r-- | .zsh/functions/cci | 10 |
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" |