Commit Graph

7 Commits

Author SHA1 Message Date
Talia 3b78fac2eb Fix mergetool 2019-09-24 09:15:25 +02:00
Talia 6ad0f8e55c Add gvimdiff as GUI difftool to gitconfig 2019-09-13 14:30:58 +02:00
Talia b5568779f8 Set git difftool to prompt for every file
Otherwise accidentally diffing a range with many changed files requires
quitting lots of vim instances and leaves no time to abort in between.
2019-09-13 14:26:44 +02:00
Talia 0f069f08aa Change git difftool to vimdiff 2019-09-13 14:23:50 +02:00
Talia 9bec530c75 Change git editors from gvim to vim 2019-09-12 10:04:25 +02:00
Talia ee35298a03 Add more stuff to gitconfig 2018-11-26 17:30:15 +01:00
Talia 4128670de2 Add gitconfig file
Can be included with

        [include]
          path = path/to/file

in local gitconfig.
2018-11-26 13:20:50 +01:00