One of my favorite bits for saving my own butt: commit more.

    "Function to commit.
    function! GitCommit ()
      execute 'write'
      let message = input('Enter commit message: ')
      execute '!git add ' . bufname('%') . ' && git commit -m ''' . message . ''';'
    endfunction
    
    imap <F7> <Esc>:call GitCommit()<CR>
    map <F7> <Esc>:call GitCommit()<CR>