diff options
| author | Ekaitz Zarraga <ekaitz@elenq.tech> | 2022-08-22 17:48:44 +0200 |
|---|---|---|
| committer | Ekaitz Zarraga <ekaitz@elenq.tech> | 2022-08-22 17:48:44 +0200 |
| commit | daacc5c866df546538851da60b7fcee5edf3eebf (patch) | |
| tree | f4941f265dfb4638ff2c3c5c6270db052b2afa00 | |
| parent | 33a64f64377e12dff1da478b0ea04a84c3986df8 (diff) | |
Git: diff3 and overview
| -rw-r--r-- | git/dot-gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git/dot-gitconfig b/git/dot-gitconfig index a0da7d2..1827554 100644 --- a/git/dot-gitconfig +++ b/git/dot-gitconfig @@ -9,10 +9,12 @@ tool = nvimdiff [merge] tool = nvimdiff + conflictStyle = diff3 [push] default = simple [alias] lg = log --graph --oneline --decorate --all + overview = log --graph --oneline --decorate --all --simplify-by-decoration [pull] ff = only [init] |