Rename to gdf

diff --git a/.config/bash/aliases b/.config/bash/aliases
index 02c490abd905aefe9808c20590ae4f446c0db75f..2db7e72e83965e9e8ede1320d1150bc3cd43fcb9 100644 (file)
--- 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 90b585ba5417f6c226e246f8fdeed92dc5411389..98b4f316c8477c0831577a437557e96e5a38fc43 100644 (file)
--- 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 471f7c376c28cf3750869190e24d21c9b1b272c9..ae8de988168ed6254ebe45fa945307eb71287b8e 100644 (file)
--- 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