diff options
| author | Camil Staps | 2021-01-31 10:39:44 +0100 |
|---|---|---|
| committer | Camil Staps | 2021-01-31 10:39:44 +0100 |
| commit | 794e27b6be2252e6a1f694aacf4ab02a003d34f0 (patch) | |
| tree | 990854783da3cf82233b60944430281fe9f228a7 /git/.gitconfig | |
| parent | Add powerline status line (diff) | |
git: allow applies with whitespace errors (needed for merges/rebases)
Diffstat (limited to 'git/.gitconfig')
| -rw-r--r-- | git/.gitconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index eaf548a..88ada2c 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -19,7 +19,7 @@ whitespace = blank-at-eol,blank-at-eof,space-before-tab,tab-indent pager = less -x1,5 [apply] - whitespace = error + #whitespace = error [mergetool] keepBackup = false [difftool] |