From bdc768fd1717b39f6bccfbb48f123f1bc485e1c1 Mon Sep 17 00:00:00 2001
From: Marco Thomas <mthomas@farellien.genua.de>
Date: Fri, 15 Nov 2019 11:31:13 +0100
Subject: [PATCH] added gitconfig, changed some aliases

---
 config.yaml        |  4 ++++
 dotfiles/bashrc    |  9 +--------
 dotfiles/gitconfig | 13 +++++++++++++
 3 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 dotfiles/gitconfig

diff --git a/config.yaml b/config.yaml
index 000d5e4..d39bcfc 100644
--- a/config.yaml
+++ b/config.yaml
@@ -9,8 +9,12 @@ dotfiles:
   f_vimrc:
     src: vimrc
     dst: ~/.vimrc
+  f_gitconfig:
+    src: gitconfig
+    dst: ~/.gitconfig
 profiles:
   default:
     dotfiles:
     - f_bashrc
     - f_vimrc
+    - f_gitconfig
diff --git a/dotfiles/bashrc b/dotfiles/bashrc
index 3a8cb3f..8c3ea14 100755
--- a/dotfiles/bashrc
+++ b/dotfiles/bashrc
@@ -11,14 +11,7 @@ alias dotdrop="~/dotfiles/dotdrop.sh --cfg=~/dotfiles/config.yaml"
 # general shorcuts
 alias ..="cd .."
 alias ll="ls -l"
-
-# git shotcuts
-alias ga="git add"
-alias gc="git commit"
-alias gp="git push"
-alias gs="git show"
-alias gl="git log"
-alias gd="git diff"
+alias la="ls -la"
 
 # Source global definitions
 if [ -f /etc/bashrc ]; then
diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
new file mode 100644
index 0000000..bca4c6a
--- /dev/null
+++ b/dotfiles/gitconfig
@@ -0,0 +1,13 @@
+[alias]
+	a = add
+	c = commit
+	d = diff
+	l = log
+	ps = push
+	pl = pull
+	sh = show
+	st = status
+[user]
+	name = Marco Thomas
+[log]
+	decorate = true