Merge branch 'maint-1.5.4' into maint

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 96a712b5ea24f83cebf7f7e465168bdce5db6673..6949cac45d0342ee6aa57bbdee5f6fe142d72c5d 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -639,7 +639,10 @@ _git_diff ()
                        --find-copies-harder --pickaxe-all --pickaxe-regex
                        --text --ignore-space-at-eol --ignore-space-change
                        --ignore-all-space --exit-code --quiet --ext-diff
-                       --no-ext-diff"
+                       --no-ext-diff
+                       --no-prefix --src-prefix= --dst-prefix=
+                       --base --ours --theirs
+                       "
                return
                ;;
        esac
@@ -696,6 +699,7 @@ _git_format_patch ()
                        --full-index --binary
                        --not --all
                        --cover-letter
+                       --no-prefix --src-prefix= --dst-prefix=
                        "
                return
                ;;