From 73c06a5fd6d363d1e9cc7ae79efa0410a3b98fdc Mon Sep 17 00:00:00 2001
From: Jannik ZANDER <jzander@grundfos.com>
Date: Fri, 15 Dec 2017 08:20:42 +0100
Subject: [PATCH] Rename to gdf

---
 .config/bash/aliases |  2 +-
 .config/git/config   | 12 ++++++------
 README.md            | 10 ++++++++++
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.config/bash/aliases b/.config/bash/aliases
index 02c490a..2db7e72 100644
--- a/.config/bash/aliases
+++ b/.config/bash/aliases
@@ -23,7 +23,7 @@ alias fgrep='fgrep --color=auto'
 if [ -e /usr/bin/vimx ]; then alias vim='/usr/bin/vimx'; fi
 
 # Shortcuts
-alias cfg='git --git-dir=$HOME/.cfg --work-tree=$HOME'
+alias gdf='git --git-dir=$HOME/.gitdotfiles --work-tree=$HOME'
 alias g='git'
 alias h='history'
 alias j='jobs'
diff --git a/.config/git/config b/.config/git/config
index 90b585b..98b4f31 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -82,21 +82,21 @@
 [push]
 	default = simple
 [diff]
-	tool = vimdiff
-#	tool = bc
+#	tool = vimdiff
+	tool = bc
 [merge]
-	tool = vimdiff
-#	tool = bc
+#	tool = vimdiff
+	tool = bc
 [difftool "vimdiff"]
 	prompt = false
 	conflictstyle = diff3
 [mergetool "vimdiff"]
 	prompt = false
 [difftool "bc"]
-#	path = C:\\Program Files\\Beyond Compare 4\\BComp.exe
+	path = C:\\Program Files\\Beyond Compare 4\\BComp.exe
 	trustExitCode = false
 [mergetool "bc"]
-#	path = C:\\Program Files\\Beyond Compare 4\\BComp.exe
+	path = C:\\Program Files\\Beyond Compare 4\\BComp.exe
 	trustExitCode = false
 [init]
 	templatedir = ~/.config/git/templates
diff --git a/README.md b/README.md
index 471f7c3..ae8de98 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 What you need to do on the new box is this:
 
     $ cd $HOME
+<<<<<<< 8b0d8fd23b8c07035b29b2f6e0a7db411d9d33b9
     $ git init --bare $HOME/.cfg
     $ alias cfg='git --git-dir=$HOME/.cfg --work-tree=$HOME'
     $ cfg config --local status.showUntrackedFiles no
@@ -10,3 +11,12 @@ What you need to do on the new box is this:
     $ cfg fetch
     $ cfg reset --hard origin/master
     $ cfg branch -u origin/master
+=======
+    $ git init --bare $HOME/.gitdotfiles
+    $ alias gdf='git --git-dir=$HOME/.gitdotfiles --work-tree=$HOME'
+    $ gdf config --local status.showUntrackedFiles no
+    $ gdf remote add origin git@bitbucket.org:jannikz/dotfiles.git
+    $ gdf fetch
+    $ gdf reset --hard origin/master
+    $ gdf branch -u origin/master
+>>>>>>> Rename to gdf
-- 
2.43.0