dotfiles/git/config

# This is Git's per-user configuration file.
[user]
	name = Eric Teunis de Boone
	email = ericteunis@deboone.nl
[gui]
	editor = geany
[push]
	default = matching
[core]
	excludesfile = ~/.config/git/ignore
	attributesfile = ~/.config/git/attributes
[color]
	ui = auto
[color "status"]
	# use different color than untracked and unmerged paths have
	changed = yellow
[merge]
	conflictstyle = diff3
[branch]
	autosetuprebase = always
[diff]
	mnemonicPrefix = true
	tool = vimdiff
[diff "pandoc"]
	textconv = pandoc --to=rst
[diff "pdf"]
	textconv = pdf2txt
[alias]
	# Short Fancy Logs
	lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'
	lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
	lg = !"git lg1"
	lga = !"git lg --all"

	s = status --short
	st = status

	pushf = push --force-with-lease # Look mom, no --force

	dif = diff
	diffc = diff --cached
	difc  = diff --cached

	alias = "! git config --get-regexp ^alias\\. "
Added SXC thingies to dotfiles, allowing for *.local files for bash and profile. Still Needs these files for tmux,vim,git,... 2016-10-02 23:39:11 +02:00			`# This is Git's per-user configuration file.`
Possiblity of having special setups for hostnames For .Bashrc aswell as generic .Profile 2016-09-26 15:40:04 +02:00			`[user]`
			`name = Eric Teunis de Boone`
Added Readme 2020-04-14 17:15:27 +02:00			`email = ericteunis@deboone.nl`
Added SXC thingies to dotfiles, allowing for *.local files for bash and profile. Still Needs these files for tmux,vim,git,... 2016-10-02 23:39:11 +02:00			`[gui]`
			`editor = geany`
Possiblity of having special setups for hostnames For .Bashrc aswell as generic .Profile 2016-09-26 15:40:04 +02:00			`[push]`
			`default = matching`
Hopefully no .sw* files are ever going to be committed 2016-10-05 01:59:04 +02:00			`[core]`
[git] moved into ~/.config 2020-04-16 20:42:52 +02:00			`excludesfile = ~/.config/git/ignore`
[git] Enable diffing documents by default 2022-03-30 18:44:43 +02:00			`attributesfile = ~/.config/git/attributes`
Git uses colors 2016-10-12 10:27:01 +02:00			`[color]`
			`ui = auto`
[git] set changed colour to yellow 2022-03-30 18:24:23 +02:00			`[color "status"]`
			`# use different color than untracked and unmerged paths have`
			`changed = yellow`
New GitMergeTool + IdentityKeys for ssh 2016-10-30 00:09:14 +02:00			`[merge]`
			`conflictstyle = diff3`
Various from Locksmith 2017-08-26 13:30:58 +02:00			`[branch]`
			`autosetuprebase = always`
			`[diff]`
[git] diff docx and odt using pandoc 2022-03-30 18:12:24 +02:00			`mnemonicPrefix = true`
Various from Locksmith 2017-08-26 13:30:58 +02:00			`tool = vimdiff`
[git] Enable diffing documents by default 2022-03-30 18:44:43 +02:00			`[diff "pandoc"]`
[git] diff docx and odt using pandoc 2022-03-30 18:12:24 +02:00			`textconv = pandoc --to=rst`
			`[diff "pdf"]`
			`textconv = pdf2txt`
Git lg for fancy log Standard esson user is etdeboone 2018-04-07 08:31:16 +02:00			`[alias]`
[ssh] moved github to config.d/ 2020-05-04 19:21:59 +02:00			`# Short Fancy Logs`
[git] iadd git alias command to inspect all aliases 2021-06-04 14:17:18 +02:00			`lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'`
			`lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'`
[ssh] moved github to config.d/ 2020-05-04 19:21:59 +02:00			`lg = !"git lg1"`
[git] iadd git alias command to inspect all aliases 2021-06-04 14:17:18 +02:00			`lga = !"git lg --all"`
[ssh] moved github to config.d/ 2020-05-04 19:21:59 +02:00
[git] add simple aliases 2022-03-30 18:26:04 +02:00			`s = status --short`
			`st = status`

			`pushf = push --force-with-lease # Look mom, no --force`

[ssh] moved github to config.d/ 2020-05-04 19:21:59 +02:00			`dif = diff`
[git] add simple aliases 2022-03-30 18:26:04 +02:00			`diffc = diff --cached`
			`difc = diff --cached`

[git] iadd git alias command to inspect all aliases 2021-06-04 14:17:18 +02:00			`alias = "! git config --get-regexp ^alias\\. "`