aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-02-10 12:52:24 -0800
committerJunio C Hamano <gitster@pobox.com>2017-02-10 12:52:24 -0800
commitf7490fdf855916a4014faeb4fa328239c7eb945b (patch)
treebd900978ab602fc29efa81cdcf1b27e530142090 /contrib
parent5c40e9ce8170991b9d6580fa1550e0a204e0f4ab (diff)
parent2cbad1764213b46057cd20028c4f7df0dad5a51f (diff)
downloadgit-f7490fdf855916a4014faeb4fa328239c7eb945b.tar.gz
git-f7490fdf855916a4014faeb4fa328239c7eb945b.tar.xz
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
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index f0ce11296..6c6e1c774 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -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=