From e5fb10ab5a4a53f4997aeda58f53420c2e2009de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20P=C5=82azie=C5=84ski?= Date: Wed, 9 Mar 2016 12:09:16 +0100 Subject: [PATCH 1/7] merged config from imp --- .gitconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitconfig b/.gitconfig index 15b698d..0bd7c90 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,10 @@ [user] name = Paweł Płazieński email = nivertius@gmail.com +[color] + ui = auto +[core] + excludesfile = ~/.gitignore_global [push] default = simple [alias] @@ -10,6 +14,7 @@ di = diff co = checkout dit = difftool --dir-diff + lg = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all [core] editor = vim [diff] From fecd208b2f046c4727190cc6e33b15a9003d0651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20P=C5=82azie=C5=84ski?= Date: Wed, 9 Mar 2016 12:10:07 +0100 Subject: [PATCH 2/7] added global ignores file --- .gitignore_global | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore_global diff --git a/.gitignore_global b/.gitignore_global new file mode 100644 index 0000000..eef29c1 --- /dev/null +++ b/.gitignore_global @@ -0,0 +1,3 @@ +*~ +*.pyc + From 7af480e67ebe53eb454d801c4d0e85b0535380ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20P=C5=82azie=C5=84ski?= Date: Wed, 9 Mar 2016 12:24:48 +0100 Subject: [PATCH 3/7] fixed config property name casing --- .gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitconfig b/.gitconfig index 0bd7c90..6b56c57 100644 --- a/.gitconfig +++ b/.gitconfig @@ -4,7 +4,7 @@ [color] ui = auto [core] - excludesfile = ~/.gitignore_global + excludesFile = ~/.gitignore_global [push] default = simple [alias] From 8382e886a0c55d08cdc4f41a79b9660388641ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20P=C5=82azie=C5=84ski?= Date: Wed, 9 Mar 2016 12:28:37 +0100 Subject: [PATCH 4/7] set whitespace errors --- .gitconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitconfig b/.gitconfig index 6b56c57..0ead597 100644 --- a/.gitconfig +++ b/.gitconfig @@ -5,6 +5,7 @@ ui = auto [core] excludesFile = ~/.gitignore_global + whitespace = trailing-space space-before-tab [push] default = simple [alias] From 14e60faebb4e9ad6d2ac3cc129835c61317dd90f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20P=C5=82azie=C5=84ski?= Date: Wed, 9 Mar 2016 17:13:24 +0100 Subject: [PATCH 5/7] enabled branches coloring --- .gitconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitconfig b/.gitconfig index 0ead597..e180bcb 100644 --- a/.gitconfig +++ b/.gitconfig @@ -2,6 +2,7 @@ name = Paweł Płazieński email = nivertius@gmail.com [color] + branch = auto ui = auto [core] excludesFile = ~/.gitignore_global From 78a76655f96fa46284146f61253942b17ca48ed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20P=C5=82azie=C5=84ski?= Date: Wed, 9 Mar 2016 17:50:45 +0100 Subject: [PATCH 6/7] added forced auto on colorings --- .gitconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitconfig b/.gitconfig index e180bcb..b8dd741 100644 --- a/.gitconfig +++ b/.gitconfig @@ -4,6 +4,12 @@ [color] branch = auto ui = auto + diff = auto + grep = auto + interactive = auto + pager = auto + showBranch = auto + status = auto [core] excludesFile = ~/.gitignore_global whitespace = trailing-space space-before-tab From 6e6ccca424734fed51b8c0c8347ec9af257d23a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20P=C5=82azie=C5=84ski?= Date: Wed, 9 Mar 2016 18:29:28 +0100 Subject: [PATCH 7/7] removed invalid value for color.pager --- .gitconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitconfig b/.gitconfig index b8dd741..e2dc3e8 100644 --- a/.gitconfig +++ b/.gitconfig @@ -7,7 +7,6 @@ diff = auto grep = auto interactive = auto - pager = auto showBranch = auto status = auto [core]