From f4ccb17bb7b532041caf6c4709a3b1fe31f5e38a Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Sun, 29 Nov 2020 22:05:34 +0100 Subject: [PATCH] .gitconfig: update --- .gitattributes | 1 + .gitconfig | 32 ++++++++++++++++++++++++++++++++ .gitconfig-ignoreblamecommit | 1 + 3 files changed, 34 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitconfig-ignoreblamecommit diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..d4e37a2 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +ChangeLog merge=git-merge-changelog diff --git a/.gitconfig b/.gitconfig index 0b649b0..5ea696d 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,4 +1,36 @@ [user] + name = Jan Kratochvil email = jan.kratochvil@redhat.com [merge] conflictstyle = diff3 +[color] + ui = never +[pull] + ff = only +# rebase = true + +# ChangeLog merge attempt: +#[merge "git-merge-changelog"] +# name = git-merge-changelog +# driver = /usr/bin/git-merge-changelog %O %A %B +# ChangeLog merge attempt: +#[core] +# attributesfile = ~/.gitattributes +# golang: +#[http] +# cookiefile = /home/jkratoch/.gitcookies +[alias] + co = checkout + ci = commit + st = status + br = branch + hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short +[pager] + branch = off +[branch] + sort = committerdate +# FIXME: It does not work: +[blame] + ignoreRevsFile = ~/.gitconfig-ignoreblamecommit +[format] + signature = diff --git a/.gitconfig-ignoreblamecommit b/.gitconfig-ignoreblamecommit new file mode 100644 index 0000000..471dc1a --- /dev/null +++ b/.gitconfig-ignoreblamecommit @@ -0,0 +1 @@ +b9c1b51e45b845debb76d8658edabca70ca56079 -- 1.8.3.1