Merge branch 'nd/gitignore-trailing-whitespace'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e74d4024233376dd8ed70cddc7708303ce4de21b..9525343fcd34ce5009fcfd9b2bf2c6356282e259 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1637,7 +1637,7 @@ _git_rebase ()
                        --preserve-merges --stat --no-stat
                        --committer-date-is-author-date --ignore-date
                        --ignore-whitespace --whitespace=
-                       --autosquash
+                       --autosquash --fork-point --no-fork-point
                        "
 
                return
@@ -2013,6 +2013,7 @@ _git_config ()
                fetch.unpackLimit
                format.attach
                format.cc
+               format.coverLetter
                format.headers
                format.numbered
                format.pretty