diff options
| author | punk <punk@libernaut> | 2021-04-21 15:42:20 +0100 |
|---|---|---|
| committer | punk <punk@libernaut> | 2021-04-21 15:42:20 +0100 |
| commit | 4107462e9ec1cabaa7f89bd8478caec3f0d5b46a (patch) | |
| tree | a2e34d995cef5ac8068ec7047e93b1125c80d175 /linux/conf/skel/.gitconfig | |
| parent | cfce80c5a0b8bc1eccc2f22a0d5d045d29467083 (diff) | |
| parent | eac48b5a8d709135a95abcc2243b369095f074f4 (diff) | |
| download | doc-4107462e9ec1cabaa7f89bd8478caec3f0d5b46a.tar.gz | |
Merge branch 'master' into develop
Diffstat (limited to 'linux/conf/skel/.gitconfig')
| -rw-r--r-- | linux/conf/skel/.gitconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linux/conf/skel/.gitconfig b/linux/conf/skel/.gitconfig new file mode 100644 index 0000000..730d8d9 --- /dev/null +++ b/linux/conf/skel/.gitconfig @@ -0,0 +1,10 @@ +[core] + pager = less -F -X + editor = vim +[diff] + tool = vimdiff +[merge] + tool = vimdiff + conflictstyle = diff3 +[difftool] + prompt = false |