Merge branch 'ew/complete-svn-authorship-options'

Correct command line completion (in contrib/) on "git svn"

* ew/complete-svn-authorship-options:
completion: fix git svn authorship switches

diff --combined contrib/completion/git-completion.bash
index f0ce11296c2475c03c4938ae64ad6e263c82260d,e88b0d777fce4793e74804010622aa9083164813..6c6e1c774d3f1524e11c1b4eb7544c8245a1affb
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1206,7 -1206,7 +1206,7 @@@ _git_describe (
  
  __git_diff_algorithms="myers minimal patience histogram"
  
 -__git_diff_submodule_formats="log short"
 +__git_diff_submodule_formats="diff log short"
  
  __git_diff_common_options="--stat --numstat --shortstat --summary
                        --patch-with-stat --name-only --name-status --color
@@@ -1552,7 -1552,7 +1552,7 @@@ _git_merge (
        case "$cur" in
        --*)
                __gitcomp "$__git_merge_options
 -                      --rerere-autoupdate --no-rerere-autoupdate --abort"
 +                      --rerere-autoupdate --no-rerere-autoupdate --abort --continue"
                return
        esac
        __gitcomp_nl "$(__git_refs)"
@@@ -1674,7 -1674,7 +1674,7 @@@ _git_pull (
        __git_complete_remote_or_refspec
  }
  
 -__git_push_recurse_submodules="check on-demand"
 +__git_push_recurse_submodules="check on-demand only"
  
  __git_complete_force_with_lease ()
  {
@@@ -1734,10 -1734,10 +1734,10 @@@ _git_rebase (
  {
        local dir="$(__gitdir)"
        if [ -f "$dir"/rebase-merge/interactive ]; then
 -              __gitcomp "--continue --skip --abort --edit-todo"
 +              __gitcomp "--continue --skip --abort --quit --edit-todo"
                return
        elif [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
 -              __gitcomp "--continue --skip --abort"
 +              __gitcomp "--continue --skip --abort --quit"
                return
        fi
        __git_complete_strategy && return
@@@ -2587,14 -2587,14 +2587,14 @@@ _git_svn (
                        --no-metadata --use-svm-props --use-svnsync-props
                        --log-window-size= --no-checkout --quiet
                        --repack-flags --use-log-author --localtime
+                       --add-author-from
                        --ignore-paths= --include-paths= $remote_opts
                        "
                local init_opts="
                        --template= --shared= --trunk= --tags=
                        --branches= --stdlayout --minimize-url
                        --no-metadata --use-svm-props --use-svnsync-props
-                       --rewrite-root= --prefix= --use-log-author
-                       --add-author-from $remote_opts
+                       --rewrite-root= --prefix= $remote_opts
                        "
                local cmt_opts="
                        --edit --rmdir --find-copies-harder --copy-similarity=