git config

.gitconfig

[core]
	quotepath = false
	whitespace = trailing-space,space-before-tab
	autocrlf = input
[alias]
	# "commit" roviditesek
	ci = commit
	cia = commit -a
	ciam = commit --amend
	cif = commit --fixup
	ciaf = commit -a --fixup

	# "stash" roviditesek
	stl = stash list
	stp = stash pop
	sts = stash push
	stsu = stash save -u
	stsp = stash show -p

	# "submodule" roviditesek
	subin = submodule init
	subst = submodule status
	subup = submodule update
	subsum = submodule summary
	subadd = submodule add
	subsync = submodule sync
	subfor = submodule foreach

	# Egyeb roviditesek
	st = status
	co = checkout
	br = branch
	ls = ls-files

	# Kulonbsegek es adott commit modositasa a whitespace figyelembevetele nelkul
	df = diff -w
	sh = show -w

	# Kulonbsegek es adott commit modositasa a soron belul
	dfw = diff --word-diff
	shw = show --word-diff

	# Stage-ben levo kulonbsegek
	dfc = diff --cached
	dfcw = diff --cached -w --word-diff

	# Naplo mutatasa a patch-ekkel egyutt
	lg = log -p

	# Commitok letoltese, majd a helyi commitok lista tetejere rendezese (rebase)
	pr = pull --rebase

	# Kulonbseg hozzaadasa patch-enkent es commit
	# "libterm-readkey-perl" csomag kell hozzá, https://stackoverflow.com/a/32546377
	addp = !git add -p && git commit

	# Commitok listaja
	lol = log --color --graph --pretty=format:\"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ai) %C(bold blue)\"  # aktuális branch
	lola = log --color --graph --pretty=format:\"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)\" --all  # minden branch
	lolf = log --color --graph --pretty=format:\"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)\" --name-status  # aktuális branch fájlokkal
	lolaf = log --color --graph --pretty=format:\"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)\" --all --name-status  # minden branch fájlokkal

	# Helyi commitok, amelyek nem lettek meg push-olva
	local = log --branches --not --remotes

	# Minden mergelt branch
	merged = branch --all --merged HEAD

	# Minden nem-mergelt branch
	not-merged = branch --all --no-merged HEAD

	# rebase
	rb = rebase
	rbc = rebase --continue

	# Alias-ok listaja
	aliases = !git config -l | grep alias | cut -c 7-

	# Azon commitok listaja, ahol fajlokat adtak hozza a repository-hoz
	added-file = log --diff-filter=A --

	# Commitolok listaja
	contributors = !git shortlog -n -s --no-merges $@ | cat - && echo && echo total $(git rev-list --count HEAD)

	# Projekt-nev beallitasa, kiolvasas: git config --local --get project.info.name
	project-name = config --replace-all project.info.name

	# Repository gyokere, atvaltas: "cd $(git root)"
	root = rev-parse --show-cdup

	# Minden branch utolso commitja
	tree = log --all --graph --decorate --oneline --simplify-by-decoration --format=\"%Cred%h%Creset %cN %Cgreen%ad%Creset %Cblue%d%Creset%s\" --date=short

	# Melyik branchekben van a commit
	find-br = branch --contains  # csak helyi
	find-brr = branch -r --contains  # csak távoli
	find-bra = branch -a --contains  # helyi és távoli

	# Megadott fajlok modositasainak visszavonasa
	undo = checkout --

	# Megadott fajlok kivetele az indexbol
	unstage = reset HEAD --

	# cherry-pick (lezeto commit felhasznalasa) az eredetire torteno hivatkozassal
	cp = cherry-pick -x

	# patch keszitese commitokkal
	fp = format-patch -k --stdout

	# nem commitolt fajlok es konyvtarak torlese, a .gitignore-ben megadottakon kivul
	cl = clean -dfx

	# force push
	pf = push --force-with-lease

	# push, upstreamként
	pu = push --set-upstream

	# ignore-alt fajlok listaja
	ignored = ls-files -o -i --exclude-standard

[color]
	ui = auto
[interactive]
	singlekey = true
[gui]
	spellingdictionary = none
[diff]
	renames = copy
[http]
	sslVerify = false
[branch]
	autosetuprebase = always
	autosetupmerge = always
[push]
	default = simple
[rerere]
	# Reuse recorded resolution of conflicted merges:
	# - http://shop.oreilly.com/product/0636920024774.do
	# - http://git-scm.com/2010/03/08/rerere.html
	enabled = 1
[transfer]
	fsckobjects = true
[fetch]
	fsckobjects = true
[grep]
	lineNumber = true
[commit]
[merge]
    tool = meld
[mergetool "meld"]
    # Choose one of these 2 lines (not both!) explained below.
    # https://newbedev.com/setting-up-and-using-meld-as-your-git-difftool-and-mergetool
    # cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
    cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"