diff --git a/autoload/airline/extensions/whitespace.vim b/autoload/airline/extensions/whitespace.vim
index c45dac4d..217775f9 100644
--- a/autoload/airline/extensions/whitespace.vim
+++ b/autoload/airline/extensions/whitespace.vim
@@ -13,7 +13,9 @@ let s:searchcount = exists('*searchcount')
 let s:enabled = get(g:, 'airline#extensions#whitespace#enabled', 1)
 let s:skip_check_ft = {'make': ['indent', 'mixed-indent-file'],
       \ 'csv': ['indent', 'mixed-indent-file'],
-      \ 'mail': ['trailing']}
+      \ 'mail': ['trailing'],
+      \ 'diff': ['trailing'],
+      \ 'gitcommit': ['trailing']}
 
 function! s:check_mixed_indent()
   let indent_algo = get(g:, 'airline#extensions#whitespace#mixed_indent_algo', 0)