git.lirion.de

Of git, get, and gud

aboutsummaryrefslogtreecommitdiffstats
path: root/.gitconfig
blob: 831bc32af813f39051097f9096494ab07d111c44 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
pre { line-height: 125%; }
td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
.highlight .hll { background-color: #ffffcc }
.highlight .c { color: #aaaaaa; font-style: italic } /* Comment */
.highlight .err { color: #FF0000; background-color: #FFAAAA } /* Error */
.highlight .k { color: #0000aa } /* Keyword */
.highlight .ch { color: #aaaaaa; font-style: italic } /* Comment.Hashbang */
.highlight .cm { color: #aaaaaa; font-style: italic } /* Comment.Multiline */
.highlight .cp { color: #4c8317 } /* Comment.Preproc */
.highlight .cpf { color: #aaaaaa; font-style: italic } /* Comment.PreprocFile */
.highlight .c1 { color: #aaaaaa; font-style: italic } /* Comment.Single */
.highlight .cs { color: #0000aa; font-style: italic } /* Comment.Special */
.highlight .gd {
[color]
	diff	= auto
	status	= auto
	branch	= auto
	ui		= auto
# To determine user and GPG key ID, we source this file:
[include]
	path	= ~/.gitconfig.local
# ...with the following content:
## vim:syntax=gitconfig
#[user]
#	name		= John McDoe III
#	email		= mail_redacted_for_web
#	signingkey	= 1FEDBEEFC0DEDBAD
[log]
	date	= iso
[alias]
	st		= status
	lg		= log -p
	dc		= diff --cached
	lol		= log --graph --decorate --pretty=format:'%C(auto)%h %G? %d %s%Creset' --abbrev-commit
	lola	= log --graph --decorate --pretty=format:'%C(auto)%h %G? %d %s%Creset' --abbrev-commit --all
	ls		= ls-files
	compactlog = log --pretty=format:"%h%x09%an%x09%ad%x09%s" --date=short
	# check out existing remote branch, e.g. origin/branchname
	cb		= checkout --track
	co		= checkout
	cob		= checkout -b
	c		= commit --verbose
	ca		= commit --verbose --all
	s		= status --short
	l		= log --color --graph --pretty=format:'%C(auto)%h %G? %d %s%Creset'
	gi		= init --bare
	gs		= init --bare --shared
	aa		= add --all --verbose
	ap		= add -p
	up		= pull --rebase=preserve
	fa		= fetch --all --verbose
	gr		= grep --break --heading --line-number
	d		= diff
	ds		= diff --stat
	dc		= diff --cached
	la		= "!git config -l|grep alias|cut -c 7-|sort|sed \"s/^\\([^=]\\+\\)=/\\1€/g\"|sed \"s|€/|@/|g;s|ts€|ts@|g;s|^la.*|la€<scrambled output, call git-alias>|g\"|column -ts€"
	alias	= "!git config -l|grep alias|cut -c 7-|sort"
	cs		= "!GPG_TTY=$(tty) git commit -S --verbose"
	csa		= "!GPG_TTY=$(tty) git commit -S --verbose --all"
	csp		= "!GPG_TTY=$(tty) git commit -S -pv"
	tag		= "!GPG_TTY=$(tty) git tag -s"
	tty		= "!export GPG_TTY=$(tty)"
	puv		= push --verbose
	puff	= "!git puv"
	pl		= pull -tpf
	p		= pull -tpf
	branchpull = remote update origin --prune
	branchremdel = push origin --delete
	ba		= branch --list --all
[push]
	default	= simple
[core]
	editor	= vim
	fileMode = true
[merge]
	tool	= vimdiff
[mergetool]
	keepBackup = false
[gui]
	fontui	= -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0
	fontdiff = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0
[commit]
	gpgSign	= true
#[gpg]
#	program	= /usr/bin/gpg2
[http]
	#proxy	= http://10.0.0.1:3128/
">0 ] && ln -sf .xsession-gnome ~/.xsession ;; kde) diff ~/.xsession-kde ~/.xsession &> /dev/null [ "$?" -ne 0 ] && ln -sf .xsession-kde ~/.xsession ;; *) echo "Sorry, I don't know $STXTARG as window manager." exit 1 ;; esac startx