From dc2092ac7751ea89f9ff607c9838f86abd3ec27e Mon Sep 17 00:00:00 2001
From: Mathieu Maret <mathieu.maret@gmail.com>
Date: Tue, 18 Oct 2016 11:06:09 +0200
Subject: [PATCH] [git] fix alias definition

---
 .gitconfig | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index cfc8ee9..6590337 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -9,7 +9,6 @@
 [pack]
     threads = 0
 [alias]
-    lg = log -M --decorate --graph
     st = status
     ci = commit
     co = checkout
@@ -21,22 +20,23 @@
     lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
     lolp = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
     ls = ls-files
-    dt =difftool # to have diff with meld
+    dt = difftool # to have diff with meld
     mylog = log --committer=\"$(git config user.name)\"
-#[diff "odf"]
-#    textconv=odt2txt
-#[diff "odt"]
-#    textconv=odt2txt
-
+    please = push --force-with-lease
 #   Remove last commit but keep changes
-    undo = git reset --soft HEAD^
-#   last commit
-    lasts = log --pretty=oneline --abbrev-commit --graph --decorate
-#   last commit from last pull
-    lastpull = !git lasts HEAD --stat --no-merges
+    undo = reset --soft HEAD^
     revertpart = reset -p HEAD^
     diffword = diff --color-words=.
-    save = stash save -u 
+    save = stash save -u
+
+[branch]
+    #New branch track remote
+    #autoSetupMerge = always
+[diff "odf"]
+    textconv=odt2txt
+[diff "odt"]
+    textconv=odt2txt
+
 [difftool "meld"]
     path = /usr/bin/meld
     trustExitCode = false
@@ -49,9 +49,12 @@
     path = /usr/bin/meld
     trustExitCode = false
 [mergetool]
+    # do not keep .ori file after a merge
     keepBackup = false
 [merge]
     tool = meld
+#    tool = vimdiff
+#    conflictstyle = diff3
 [push]
 	default = simple
 [credential]