summary refs log tree commit diff stats
path: root/git/.config/git/config
diff options
context:
space:
mode:
authorAlan Pearce2017-03-17 09:48:24 +0100
committerAlan Pearce2017-03-17 09:48:24 +0100
commit397ce671bb028802d528faf8811101e08557e527 (patch)
tree6a3b0004c7fcbe334f05a50aad483316c6577887 /git/.config/git/config
parentdb6903e6fab9cff359a530ca2eee6ba3c7e44525 (diff)
downloaddotfiles-397ce671bb028802d528faf8811101e08557e527.tar.lz
dotfiles-397ce671bb028802d528faf8811101e08557e527.tar.zst
dotfiles-397ce671bb028802d528faf8811101e08557e527.zip
Re-structure tags to GNU stow format
Diffstat (limited to 'git/.config/git/config')
-rw-r--r--git/.config/git/config34
1 files changed, 34 insertions, 0 deletions
diff --git a/git/.config/git/config b/git/.config/git/config
new file mode 100644
index 0000000..6228a08
--- /dev/null
+++ b/git/.config/git/config
@@ -0,0 +1,34 @@
+[user]
+	email = alan@alanpearce.uk
+	name = Alan Pearce
+[color]
+	branch = auto
+	diff = auto
+	status = auto
+	ui = true
+[push]
+	default = current
+[alias]
+	up = merge FETCH_HEAD
+	st = status -sb
+	ci = commit
+	br = branch
+	co = checkout
+	ready = rebase -i @{u}
+	lg = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
+	standup = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --since yesterday --author Alan
+	ignored = ls-files --others -i --exclude-standard
+	pr = pull-request
+	delete-merged = "!sh -c 'git branch --merged | grep -v "\\*" | grep -v master | grep -v dev | xargs -n 1 git branch -d'"
+[github]
+	user = alan@alanpearce.uk
+[diff]
+	algorithm = patience
+[include]
+	path = config.local
+[core]
+	excludesfile = ~/.config/git/ignore
+[rebase]
+	autosquash = true
+[rerere]
+	enabled = true