Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Git Config syntax test file #1336

Merged
merged 1 commit into from
Oct 24, 2020

Conversation

senden9
Copy link
Contributor

@senden9 senden9 commented Oct 24, 2020

cc #1213

As written in the license file this example comes form the git documentation. Syntax highlighting looks correct. I have checked the created highlighted file. We also have quite some syntax here that is tested with that test.

@sharkdp
Copy link
Owner

sharkdp commented Oct 24, 2020

Thank you very much for your contribution!

If possible, I would like to avoid a GPL contribution (see #1318 (comment) and the description in #1213 ("license is compatible with bats license"). I'm not 100% sure that this is really necessary, but if there is another way, I would prefer that.

@senden9
Copy link
Contributor Author

senden9 commented Oct 24, 2020

OK. I will then just read the documentation about available options and write a config file entire by hand. So we can avoid the license issue.

@SuperSandro2000
Copy link

SuperSandro2000 commented Oct 24, 2020

You can use my personal gitconfig. An attribution would be nice but you are free to use it.

[alias]
	br = branch
	branch = branch -a
	c = clone --recursive
	ci = commit
	cl = clone
	co = checkout
	contributors = shortlog --summary --numbered
	lg = 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)'
	remote = remote -v
	st = status
	tag = tag -l
[apply]
	whitespace = fix
[color]
	ui = true
[color "branch"]
	current = yellow
	local = yellow
	remote = green
[color "diff"]
	commit = yellow bold
	frag = magenta bold
	meta = yellow
	new = green bold
	old = red bold
	whitespace = red reverse
[color "diff-highlight"]
	newHighlight = green bold 22
	newNormal = green bold
	oldHighlight = red bold 52
	oldNormal = red bold
[color "status"]
	added = green
	changed = yellow
	untracked = cyan
[commit]
	gpgsign = true
[core]
	editor = /usr/bin/vim
	# global exclude
	excludesfile = /home/frank/.config/git/ignore
	pager = delta
	; broken on old machines
	untrackedCache = true
[credential]
	helper = store
[delta]
	features = line-numbers decorations
	max-line-length = 1024
	whitespace-error-style = 22 reverse
[delta "decorations"]
	commit-decoration-style = bold yellow box ul
	file-decoration-style = none
	file-style = bold yellow
	syntax-theme = gruvbox
[diff]
	submodule = diff
	algorithm = histogram
	renames = copies
[difftool]
	prompt = false
[difftool "wrapper"]
	binary = true
	cmd = git-difftool-wrapper \"$LOCAL\" \"$REMOTE\"
[diff "pdfconv"]
	textconv = pdftohtml -stdout
[fetch]
	negotiationAlgorithm = skipping
	parallel = 0
[help]
	autocorrect = 1
[index]
	version = 4
[interactive]
	diffFilter = delta --color-only
[merge]
	log = true
[protocol]
	version = 2
[pull]
	rebase = true
[push]
	default = current
	recurseSubmodules = on-demand
[rebase]
	autoStash = true
[rerere]
	autoUpdate = true
	enabled = true
[sequence]
	editor = interactive-rebase-tool
[submodule]
	fetchJobs = 0
[tag]
	gpgSign = true
	sort = -version:refname
[url "git@gist.github.com:"]
	insteadOf = gist:
	pushInsteadOf = https://gist.github.com/
[url "git@github.com:"]
	insteadOf = gh:
	pushInsteadOf = https://github.com/
[user]
	email = f.nord@example.com
	name = Frank Nord
	signingkey = AAAAAAAAAAAAAAAA

@senden9 senden9 force-pushed the feature/gitconfig_syntax_test branch from b1a342c to af56eca Compare October 24, 2020 12:21
@senden9 senden9 force-pushed the feature/gitconfig_syntax_test branch from af56eca to 66a638d Compare October 24, 2020 12:25
@senden9
Copy link
Contributor Author

senden9 commented Oct 24, 2020

@sharkdp this pull request is ready again.

@SuperSandro2000 I was in progress of crafting a complex config as I saw that your comment. That file already has everything we need I think :D. Of curse I named you as creator.

@sharkdp sharkdp merged commit 7a7bb80 into sharkdp:master Oct 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants