A try to turn off formating in git.

vim/vimrc

@@ -114,10 +114,6 @@ if has('autocmd')
 	autocmd FileType python setlocal expandtab
 endif
 
-"	P4
-command! -nargs=* PFedit :!p4 edit <args> %
-command! -nargs=* PFrevert :!p4 revert <args> %
-command! -nargs=* PFdiff :!p4 diff <args> %
 " Only do this part when compiled with support for autocommands.
 if has("autocmd")
 
@@ -183,6 +179,13 @@ function MyDiff()
   silent execute '!' . cmd . ' ' . opt . arg1 . ' ' . arg2 . ' > ' . arg3 . eq
 endfunction
 
+"   Don't let vim be too smart.
+set formatoptions=cql
+"
+"	P4
+command! -nargs=* PFedit :!p4 edit <args> %
+command! -nargs=* PFrevert :!p4 revert <args> %
+command! -nargs=* PFdiff :!p4 diff <args> %
 "
 " Loads CF5Compile
 " Compile and run file if Ctrl-F5 is pressed.