From 16c47a3969099a22c51fa3e1868b7c16be896e82 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 25 Jun 2021 19:36:07 +0200 Subject: Add git config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- git/config | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 git/config (limited to 'git/config') diff --git a/git/config b/git/config new file mode 100644 index 0000000..28ab974 --- /dev/null +++ b/git/config @@ -0,0 +1,12 @@ +[color] + diff = auto + status = auto + branch = auto +[push] + default = matching +[init] + defaultBranch = master +[pull] + rebase = false +[merge] + conflictStyle = diff3 -- cgit v1.2.3-70-g09d2