diff --git a/.github/labeler.yml b/.github/labeler.yml
index e8e6e50..4622e88 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -34,6 +34,11 @@ Ansible:
           - roles/**/*
           - bootstrap.yml
 
+Git:
+  - changed-files:
+      - any-glob-to-any-file:
+          - git/**/*
+
 Neovim:
   - changed-files:
       - any-glob-to-any-file:
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index f73bbd5..8319a37 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -21,6 +21,7 @@ jobs:
           scopes: |
             alacritty
             ansible
+            git
             neovim
             starship
             task
diff --git a/git/.gitconfig b/git/.gitconfig
new file mode 100644
index 0000000..388bd40
--- /dev/null
+++ b/git/.gitconfig
@@ -0,0 +1,20 @@
+[diff]
+	tool = difftastic
+[merge]
+	conflictStyle = zdiff3
+[user]
+	name = Kirill Morozov
+[pager]
+	difftool = true
+[push]
+	autoSetupRemote = true
+[pull]
+	rebase = true
+[difftool]
+	prompt = false
+[difftool "difftastic"]
+	cmd = difft "$MERGED" "$LOCAL" "abcdef1" "100644" "$REMOTE" "abcdef2" "100644"
+[credential "https://github.com"]
+	helper = !/opt/homebrew/bin/gh auth git-credential
+[credential "https://gist.github.com"]
+	helper = !/opt/homebrew/bin/gh auth git-credential
diff --git a/roles/development_machine/tasks/install-macos-packages.yml b/roles/development_machine/tasks/install-macos-packages.yml
index 1cc5384..d3eb2fc 100644
--- a/roles/development_machine/tasks/install-macos-packages.yml
+++ b/roles/development_machine/tasks/install-macos-packages.yml
@@ -4,6 +4,7 @@
     state: latest
     package:
       - btop
+      - difftastic
       - eza
       - fd
       - fzf
diff --git a/roles/development_machine/tasks/install-rpm-packages.yml b/roles/development_machine/tasks/install-rpm-packages.yml
index 063ab89..047b14a 100644
--- a/roles/development_machine/tasks/install-rpm-packages.yml
+++ b/roles/development_machine/tasks/install-rpm-packages.yml
@@ -58,6 +58,7 @@
     pkg:
       - alacritty
       - btop
+      - difftastic
       - eza
       - fd-find
       - fzf
diff --git a/roles/development_machine/vars/config-links.yml b/roles/development_machine/vars/config-links.yml
index ac4045c..dcb833b 100644
--- a/roles/development_machine/vars/config-links.yml
+++ b/roles/development_machine/vars/config-links.yml
@@ -2,6 +2,8 @@
 development_machine_directory_mapping:
   - source: "{{ playbook_dir }}/alacritty"
     target: "{{ development_machine_xdg_config_home }}/alacritty"
+  - source: "{{ playbook_dir }}/git"
+    target: "~"
   - source: "{{ playbook_dir }}/neovim"
     target: "{{ development_machine_xdg_config_home }}/nvim"
   - source: "{{ playbook_dir }}/starship"