diff options
| author | Jean Delvare <jdelvare@suse.de> | 2014-12-07 16:04:45 +0100 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2014-12-07 16:04:45 +0100 |
| commit | 25da295f735a990dac4d5c68c2d6e09a8937c1e6 (patch) | |
| tree | a85ed342ba6b2f40281e69b17a4c635cc00a30a5 | |
| parent | 3a56cb82222266a1e24b5fa8562eb3d1fd6fccd2 (diff) | |
| download | quilt-25da295f735a990dac4d5c68c2d6e09a8937c1e6.tar.gz | |
push: Clean up stray references to interactive mode
The push --interactive option has been removed long ago, clean up
remaining references.
| -rw-r--r-- | bash_completion | 2 | ||||
| -rw-r--r-- | po/ru.po | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/bash_completion b/bash_completion index a1e275f..b6a04ae 100644 --- a/bash_completion +++ b/bash_completion @@ -244,7 +244,7 @@ _quilt_completion() COMPREPLY=( $( compgen -W "-a -f -R -q -v -h $(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) ) ;; push) - COMPREPLY=( $( compgen -W "-a -f -q -v -h --leave-rejects --interactive --color $(quilt --quiltrc - unapplied 2>/dev/null)" -- $cur ) ) + COMPREPLY=( $( compgen -W "-a -f -q -v -h --leave-rejects --color $(quilt --quiltrc - unapplied 2>/dev/null)" -- $cur ) ) ;; refresh) case $prev in @@ -1034,10 +1034,6 @@ msgstr "" "\tОставлять файлы reject, созданные программой patch, даже если патч\n" "\tне был применён.\n" "\n" -"--interactive\n" -"\tПозволить утилите patch спрашивать о разрешении конфликтов. Если\n" -"\tэта опция не указана, опция -f будет передана программе patch.\n" -"\n" "--color[=always|auto|never]\n" "\tИспользовать подсветку синтаксиса.\n" |