Merge branch 'rs/diff-ihc'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 3b25d48098b99646819999bd29e64ade517419d6..8ec782dc54c9eb49873e38b75d925babe9a7746c 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -776,6 +776,7 @@ _git_diff ()
                        --no-ext-diff
                        --no-prefix --src-prefix= --dst-prefix=
                        --base --ours --theirs
+                       --inter-hunk-context=
                        "
                return
                ;;
@@ -967,6 +968,7 @@ _git_log ()
                        --color-words --walk-reflogs
                        --parents --children --full-history
                        --merge
+                       --inter-hunk-context=
                        "
                return
                ;;