Merge branch 'db/svn-fe-code-purge' into svn-fe

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1b589fadbb5dd94827cf1565bce232d0f3a3c42a..840ae38760a5de84b369b208a52cc579ce478378 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1577,6 +1577,8 @@ __git_log_common_options="
        --max-count=
        --max-age= --since= --after=
        --min-age= --until= --before=
+       --min-parents= --max-parents=
+       --no-min-parents --no-max-parents
 "
 # Options that go well for log and gitk (not shortlog)
 __git_log_gitk_options="