[core] excludesfile = ~/.config/git/ignore editor = "$EDITOR" pager = "$PAGER -+C -F" fileMode = false hooksPath = ~/.config/git/hooks whitespace = fix,trailing-space,cr-at-eol autocrlf = input [i18n] commitEncoding = utf-8 logOutputEncoding = utf-8 [init] defaultBranch = master [push] default = current [pull] rebase = false [color] status = auto diff = auto branch = auto interactive = auto grep = auto ui = auto [advice] addEmptyPathspec = false [log] abbrevCommit = true showSignature = true [apply] whitespace = fix [diff] mnemonicPrefix = true suppressBlankEmpty = true rename = copy submodule = short [alias] a = "!git ls-files --exclude-standard -m --others -t | fzf -m --bind ctrl-a:toggle-all | cut -d' ' -f2 | xargs git add" d = diff --color-words ds = diff --staged --color-words dno = diff --name-only co = checkout ci = commit ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)" pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)" st = status br = branch bm = branch --merged bn = branch --no-merged hist = log --pretty=format:\"%Cgreen%h %Creset%cd %Cblue[%cn](%G?) %Creset%s%C(yellow)%d%C(reset)\" --graph --date=relative --decorate --color=always history = hist --all hs = hist -n 10 last = log -1 HEAD today = hist --since=midnight df = "!git log --pretty=format:\"%h %cd [%cn] %s%d\" --date=relative | fzf +m | awk '{print $1}' | xargs -I {} git diff {}^ {}" type = cat-file -t dump = cat-file -p unstage = "reset HEAD --" # edit conflicted file on merge edit-unmerged = "!$EDITOR $(git ls-files --unmerged | cut -f2 | sort -u)" # add conflicted file on merge add-unmerged = "!git add $(git ls-files --unmerged | cut -f2 | sort -u)" remove-remote-tag = "!f() { git tag -d $1 && git push origin :refs/tags/$1 }; f" [github] user = "thek4n" email = "thek4n@yandex.ru" [user] name = "thek4n" email = "thek4n@yandex.ru" signingkey = "thek4n" [url "https://github.com/"] insteadOf = "gh:" [url "git@github.com:"] pushInsteadOf = "https://github.com/" pushInsteadOf = "http://github.com/" pushInsteadOf = "gh:" [url "https://gist.github.com/"] insteadOf = "gist:" [url "git@gist.github.com:"] pushInsteadOf = "https://gist.github.com/" pushInsteadOf = "http://gist.github.com/" pushInsteadOf = "gist:"