From 49edb64dc04daa6fc004ad965f6143b3407c2b21 Mon Sep 17 00:00:00 2001
From: Laurent Drogou <laurent.drogou@rca.fr>
Date: Fri, 25 Mar 2022 18:48:37 +0100
Subject: [PATCH] =?UTF-8?q?chore:=20mise=20=C3=A0=20jour=20de=20la=20conf?=
 =?UTF-8?q?=20git?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/.gitconfig | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/conf/.gitconfig b/conf/.gitconfig
index dd52b2a..c1bf659 100644
--- a/conf/.gitconfig
+++ b/conf/.gitconfig
@@ -1,34 +1,48 @@
 [user]
         email = laurent.drogou@rca.fr
-        name = ladro
+	name = Laurent Drogou
 [core]
         editor = vim
 [alias]
         st = status
-        br = branch -a
+        br = branch
         ch = checkout
         rt = reset --hard HEAD
-        unstage = reset HEAD
+        rto = "!git reset --hard origin/$(git currentbranch)"
         lol = log --graph --decorate --pretty=format:'%C(red)%h%Creset -%C(yellow)%d%Creset %s %C(bold blue)%an%Creset %C(green)%cd' --abbrev-commit
         lola = log --graph --decorate --pretty=format:'%C(red)%h%Creset -%C(yellow)%d%Creset %s %C(bold blue)%an%Creset %C(green)%cd' --abbrev-commit --all
-        lpush = "!git --no-pager log origin/$(git currentbranch)..HEAD --oneline"
-        lpull = "!git --no-pager log HEAD..origin/$(git currentbranch) --oneline"
-        whatsnew = "!git diff origin/$(git currentbranch)...HEAD"
-        wn = "!git diff origin/$(git currentbranch)...HEAD"
-        whatscoming = "!git diff HEAD...origin/$(git currentbranch)"
-        wc = "!git diff HEAD...origin/$(git currentbranch)"
         currentbranch = "!git branch | grep \"^\\*\" | cut -d \" \" -f 2"
-        ca = "!git add . && git pl && git commit -a -m "
         pl = "!git pull origin $(git currentbranch)"
-        plall = "!git pull origin $(git currentbranch) && git fetch --all"
         ps = "!git push origin $(git currentbranch)"
         psf = "!git push -f origin $(git currentbranch)"
-        co = "!git add . && git commit -a -m "
-        clearpom = "!git reset HEAD */pom.xml ; git checkout */pom.xml ; git reset HEAD pom.xml ; git checkout pom.xml"
-        fixup = !sh -c 'SHA=$(git rev-parse $1) && git commit --fixup $SHA && git rebase -i --autosquash $SHA~' -
+        can = "!git commit --amend --no-edit "
+	plm = "!git pull --rebase origin master"
 [color]
         branch = auto
         diff = auto
         status = auto
         interactive = auto
 
+[gui]
+	spellingdictionary = none
+[submodule]
+	recurse = true
+	recurse = true
+	recurse = true
+	recurse = true
+	recurse = true
+	recurse = true
+	recurse = true
+	recurse = true
+	recurse = true
+	recurse = true
+[fetch]
+	recurseSubmodules = true
+	recurseSubmodules = true
+	recurseSubmodules = true
+	recurseSubmodules = true
+	recurseSubmodules = true
+	recurseSubmodules = true
+	recurseSubmodules = true
+	recurseSubmodules = true
+	recurseSubmodules = true