Git config

.bashrc

alias gui='git gui&'
alias gitk='gitk --all &'

source /c/dev/git-bash-tools/completion.bash # find it in your git installation path

hg_ps1() {
    hg prompt "{ {branch}}{ at {bookmark}}{{status}}" 2> /dev/null
}

function color_my_prompt {
	source /c/dev/git-bash-tools/prompt.sh # find it in your git installation path

	local __user_and_host="\[\033[01;32m\]\u@\h"
	local __cur_location="\[\033[01;34m\]\w"
	local __git_branch_color="\[\033[31m\]"
	local __git_branch='$(__git_ps1)$(hg_ps1)'
	local __prompt_tail="\[\033[33m\]$"
	local __last_color="\[\033[00m\]"
	export PS1="$__cur_location$__git_branch_color$__git_branch $__prompt_tail$__last_color "
}
color_my_prompt

.gitconfig

[user]
	useconfigonly = true
	email = [email protected]
	name = Jan Skrasek

[core]
	excludesfile = ~/.gitignore_global
	fscache = true
	editor = "'C:/Soft_x86/NPP/notepad++.exe' -multiInst -notabbar -nosession -noPlugin"
	autocrlf = input

[color]
	ui = auto
	diff = auto	
	status = auto
	branch = auto
	interactive = auto

[color "branch"]
	current = yellow reverse
	local = yellow
	remote = green

[alias]
	s = status
	co = commit
	ca = commit --amend
	fixup = commit --amend
	p = push
	pf = push --force-with-lease
	pu = push -u
	b = branch -v
	c = checkout
	ch = checkout
	l = log --pretty=format:'%Cred%h%Creset | %Cgreen%s%Creset [%ar by %an]'
	g = log --all --graph --decorate --oneline
	graph = log --all --graph --decorate --oneline
	unstage = reset HEAD --
	last = log -1 HEAD
	upstream = log --oneline master..origin/master
	pending = log --oneline origin/master..master
	pr = pull --rebase --prune
	rc = rebase --continue
	rs = rebase --skip
	ra = rebase --abort
	mt = mergetool
	rim = rebase -i master
	standup = !"git log --reverse --branches --since='$(if [[ "Mon" == "$(date +%a)" ]]; then echo "last Friday"; else echo "yesterday"; fi)' --author=$(git config --get user.email) --format=format:'%C(cyan) %ad %C(yellow)%h %Creset %s %Cgreen%d' --date=local"

[mergetool]
	prompt = false
	keepBackup = false
	keepTemporaries = false
 
[merge]
	tool = winmerge
	ff = false
 
[mergetool "winmerge"]
	name = WinMerge
	trustExitCode = true
;	cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e -dl \"Local\" -dr \"Remote\" $MERGED $REMOTE
	cmd = "\"/c/Program Files (x86)/WinMerge/WinMergeU.exe\" \"$MERGED\""
 
[diff]
	tool = winmerge
	compactionHeuristic = true
 
[difftool "winmerge"]
	name = WinMerge
	trustExitCode = true
	cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e $LOCAL $REMOTE

[gui]
	encoding = utf-8
[filter "lfs"]
	clean = git lfs clean %f
	smudge = git lfs smudge %f
	required = true
[push]
	default = current
[pull]
	ff = only
[oh-my-zsh]
	hide-status = 1
[credential]
	helper = manager

.gitignore_global

# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so

# Packages #
############
# it's better to unpack these files and commit the raw source
# git has its own built in compression methods
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip

# OS generated files #
######################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db

.idea
.idea/workspace.xml
.idea/shelf

.sass-cache