git/config/git/config

# vim: ft=gitconfig
[include]
	path = tools/kdiff3
	path = config.os
	path = config.local

[user]
	name = Danielle McLean
	email = dani@00dani.me

[alias]
	co = checkout
	d = diff
	l = log --graph --oneline --decorate --all
	st = status --short
	shove = "!f() { git push ${1:-origin} :; }; f"

[url "git@github.com:"]
	pushInsteadOf = https://github.com/

[git-up.rebase]
	arguments = --preserve-merges

[gpg]
	program = gpg-for-git-signing

[rerere]
	enabled = true
Enable kdiff3 by default and allow OS-specific packages to override 2016-11-19 03:07:49 -05:00			`# vim: ft=gitconfig`
Initial commit, not a lot to it yet 2016-10-02 21:44:37 -04:00			`[include]`
Enable kdiff3 by default and allow OS-specific packages to override 2016-11-19 03:07:49 -05:00			`path = tools/kdiff3`
			`path = config.os`
Move configs into XDG_CONFIG_HOME instead 2016-10-03 00:42:18 -04:00			`path = config.local`
Initial commit, not a lot to it yet 2016-10-02 21:44:37 -04:00
Move public user info into the versioned config, and GPG stuff into the private config.local 2016-10-23 00:03:26 -04:00			`[user]`
			`name = Danielle McLean`
Change the committer email address to my personal domain 2017-04-17 04:33:12 -04:00			`email = dani@00dani.me`
Move public user info into the versioned config, and GPG stuff into the private config.local 2016-10-23 00:03:26 -04:00
Initial commit, not a lot to it yet 2016-10-02 21:44:37 -04:00			`[alias]`
Add co alias for git checkout 2016-10-03 01:09:54 -04:00			`co = checkout`
Initial commit, not a lot to it yet 2016-10-02 21:44:37 -04:00			`d = diff`
			`l = log --graph --oneline --decorate --all`
			`st = status --short`
			`shove = "!f() { git push ${1:-origin} :; }; f"`

Push to GitHub over SSH even if you cloned over HTTPS 2016-10-03 17:34:07 -04:00			`[url "git@github.com:"]`
			`pushInsteadOf = https://github.com/`
Make conflicts easier to handle by preserving merges on rebase and enabling rerere 2016-11-17 17:47:20 -05:00
			`[git-up.rebase]`
			`arguments = --preserve-merges`
Add gpg2 wrapper program that applies --no-tty flag 2017-02-26 21:50:28 -05:00
			`[gpg]`
Migrate gpg wrapper from using gpg2 to just gpg, because GnuPG 2.1.23 removes the 'gpg2' alias 2017-08-09 21:13:58 -04:00			`program = gpg-for-git-signing`
Add gpg2 wrapper program that applies --no-tty flag 2017-02-26 21:50:28 -05:00
Make conflicts easier to handle by preserving merges on rebase and enabling rerere 2016-11-17 17:47:20 -05:00			`[rerere]`
			`enabled = true`