diff options
| -rw-r--r-- | .config/git/config | 48 | ||||
| -rw-r--r-- | .config/git/ignore | 23 | ||||
| -rw-r--r-- | .gitignore | 3 |
3 files changed, 74 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config new file mode 100644 index 0000000..1f4dd13 --- /dev/null +++ b/.config/git/config @@ -0,0 +1,48 @@ +[alias] + a = add + b = branch + c = commit + ca = commit --amend --reset-author + co = checkout + cob = checkout -b + ct = tag -s + #cd = ! cd -- "$(pwd)" + d = diff + fo = fetch origin + l = log --date=format:'%Y-%m-%d %H:%M:%S' --pretty=format:'%C(6)%ad %C(3)%h%Creset %s %C(7)by %C(2)%ae%C(7):%C(5)%G?' + lg = log --graph --abbrev-commit --decorate --date=relative --all + p = push + pa = push-all + prev = ! git show "HEAD:$1" + r = rebase --preserve-merges -i + ra = commit --amend --no-edit -a + rc = rebase --continue + s = status -s + t = tag + tr = for-each-ref --sort=taggerdate --format '%(tag)' refs/tags + +[commit] + gpgsign = true + +[core] + pager = less -R + excludesfile = ~/.config/git/ignore + +[diff] + tool = vimdiff + +[difftool] + prompt = false + +[pull] + default = current + #rebase = true + +[push] + default = current + followTags = true + +[user] + email = p.spek@tyil.nl + name = Patrick Spek + signingkey = 1660F6A2DFA75347322A4DC07A6AC285E2D98827 diff --git a/.config/git/ignore b/.config/git/ignore new file mode 100644 index 0000000..b84abd4 --- /dev/null +++ b/.config/git/ignore @@ -0,0 +1,23 @@ +# +# Misc +# + +# Perl 6 precompilation files +.precomp + +# +# Editor files +# + +# Comma +.idea +.iml + +# Emacs +*~ +.#* +\#* +*# + +# Vim +.*.sw? @@ -19,6 +19,9 @@ /.vim/bundle /.vim/.netrwhist +# dev-vcs/git +!/.config/git + # x11-terms/termite https://anongit.gentoo.org/git/user/eroen.git !/.config/termite |