aboutsummaryrefslogtreecommitdiff
path: root/.config/git/config
diff options
context:
space:
mode:
Diffstat (limited to '.config/git/config')
-rw-r--r--.config/git/config61
1 files changed, 37 insertions, 24 deletions
diff --git a/.config/git/config b/.config/git/config
index 63ea101..212776b 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,26 +1,27 @@
[alias]
- a = add
- b = branch
- bc = branch-cleanup
- c = commit
- ca = commit --amend --reset-author
- co = checkout
- cob = checkout -b
- ct = tag -s
- 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
+ a = add
+ b = branch
+ bc = branch-cleanup
+ c = commit
+ ca = commit --amend --reset-author
+ co = checkout
+ cob = checkout -b
+ ct = tag -s
+ 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
mirror-add = ! git remote set-url --add --push origin
- p = push
- pa = push-all
- prev = ! git show "HEAD:$1"
- r = rebase --rebase-merges -i
- ra = commit --amend --no-edit -a
- rc = rebase --continue
- s = status -s
- t = tag --sort=-v:refname
- tr = for-each-ref --sort=taggerdate --format '%(tag)' refs/tags
+ p = push
+ pa = push-all
+ prev = ! git show "HEAD:$1"
+ r = rebase --rebase-merges -i
+ ra = commit --amend --no-edit -a
+ rc = rebase --continue
+ s = status -s
+ squash-all = "!f(){ git reset $(git commit-tree HEAD^{tree} \"$@\");};f"
+ t = tag --sort=-v:refname
+ tr = for-each-ref --sort=taggerdate --format '%(tag)' refs/tags
[commit]
gpgsign = true
@@ -39,6 +40,12 @@
[difftool]
prompt = false
+[gpg]
+ format = ssh
+
+[gpg "ssh"]
+ allowedSignersFile = ~/.config/git/authorized_keys
+
[init]
defaultBranch = master
@@ -53,7 +60,13 @@
default = current
followTags = true
+[safe]
+ directory = *
+
+[tag]
+ gpgsign = true
+
[user]
- email = p.spek@tyil.nl
- name = Patrick Spek
- signingkey = 1660F6A2DFA75347322A4DC07A6AC285E2D98827
+ email = p.spek@tyil.nl
+ name = Patrick Spek
+ signingKey = ~/.config/git/signingkey # Symlink to the SSH key to be used