git config配置

[core] 
	autocrlf = input
	excludesfile = c:/Users/USERNAME/.gitignorefiles
	ignorecase = false
	safecrlf = warn

[gui]
	recentrepo = c:/workspace/E2E_Flows
[push]
	default = simple
[color]
	ui = true
[alias]
	pru = "pull --rebase upstream"
	po = "push origin"
	pldev = "pull --rebase upstream development"
	plrel = "pull --rebase upstream release"
	plmas = "pull --rebase upstream master"
	pso = "push origin"
	crc = "commit -m 'resolve conflict'"
	fu = "fetch upstream -p"
	frd = !"git fetch upstream -p; git rebase upstream/develop"
	rd = "rebase origin/development"
	rr = "rebase origin/release"
	psdev = "push origin development:development"
	psrl = "push origin release:release"
	ci = commit
	st = status
	sts = "status -s"
	restore = "!sh -c 'git checkout -- $1' -"
	br = branch
	au = "add -u ."
	who = "shortlog -s --"
	last = "log -1"
	la = "!sh -c 'git log -$1' -"
	hist = "log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short"
	type = "cat-file -t"
	dump = "cat-file -p"
	cm = "commit -am"
	ada = "add -A ."
	unstage = "revert HEAD -- "
	undo = "reset --hard"
	rc = "rm --cached"
	whatdevtopush = "log origin/development..HEAD"
	whatreltopush = "log origin/release..HEAD"
	bw = "!sh -c 'git blame -w -L$1,+1 $2' -"
	bl = "!sh -c 'git blame -w -L$1,+$2 $3' -"
	bg = "!sh -c 'git gui blame --line=$1 $2' -"
	blu = "!sh -c 'cd /c/workspace/bluefin-gui/'"


	diffbranch = "!sh -c 'git log --left-right $1...$2' - "
	usepatche2eflow = "!sh -c 'curl https://github.com/USER/PROJECT/pull/$1.patch|git am' -"


	#step 1
	nnewbranch = "!sh -c 'git branch |grep contrib |xargs git branch -D; git checkout -b contrib-$1' -"
	#step 2
	rebaseContrib = "!sh -c 'git pull --rebase git@github.com:$1/PROJECT.git develop' -"
	#step 3
	co = checkout
	#step 4
	mmrgpullrequest = "!sh -c 'git merge --ff-only contrib-$1' -"
	#step clean
	ccleancontrib = "! git branch |grep contrib |xargs git branch -D"

	foo = "! echo begin arg=$1/$2/end"
	fooo = "!sh -c 'git co release; git co development'"
	#$1 - branch name
	#$2 - contributor's name
	#$3 - contributor's branch



[diff]
	tool = p4merge
[difftool "p4merge"]
	external = "p4merge $LOCAL $REMOTE"  
    prompt = false
[merge]
	tool = p4merge
[mergetool "p4merge"]
	cmd = "p4merge $BASE $LOCAL $REMOTE $MERGED" 
    prompt = false  
    keepTemporaries = false  
    trustExitCode = true  
    keepBackup = false  
[remote "origin"]
	push = HEAD
[credential]
	helper = osxkeychain
[clean]
	requireForce = false