어디선가 업어온 거 'ㅅ'/

gistfile1.txt

[color]
	# colorの設定(以下のコマンドは自動で色つける)
	status = auto
	diff = auto
	branch = auto
	interactive = auto
	grep = auto
[push]
	default = tracking       # defaultのpush先はtrackingしているリポジトリ
[core]
	excludesfile = /Users/marocchino/.gitignore_global
	autocrlf = input                 # CRLFを自動変換
	editor = vim
[diff]
	tool = vimdiff
[alias]
	st = status
	sh = show
	so = remote show origin
	ft = fetch
	#up = pull --rebase       # pull rebase
	up = svn rebase # pull rebase
	rbm = rebase master      # masterへのrebaseはよく使うのでalias
	ad = add
	ci = commit -a           # modifiedなファイルを全てstageへ
	cam = commit -a --amend  # 直前のcommitを修正
	co = checkout
	# branch関連
	br = branch
	ba = branch -a           # originも含めた全てのbranchを表示
	bm = branch --merged     # merge済みのbranchを表示
	bn = branch --no-merged  # mergeしてないbranchを表示
	# log関連
	wc = whatchanged         # logに変更されたファイルも一緒に出す
	ls = log --stat          # logに変更されたファイルも一緒に出す
	lp = log -p              # diffも一緒に出す
	la = log --pretty=\"format:%ad %h (%an): %s\" --date=short  # ざっくりログ出す
	lr = log origin          # originのlog
	oneline = log --pretty=oneline
	ranking = shortlog -s -n --no-merges
	log-graph = log --graph --date=short --pretty=format:'%Cgreen%h %cd %Cblue%cn %Creset%s'
	log-all = log --graph --all --color --pretty='%x09%h %cn%x09%s %Cred%d%Creset'
	dm = diff master           # masterとのdiff
	dw = diff --color-words    # 単語単位でいろつけてdiff
	dc = diff --cached         # addされているものとのdiff
	ds = diff --staged         # 同上(1.6.1移行)
	dt1 = difftool HEAD~            # HEADから1つ前とdiff
	dt2 = difftool HEAD~~           # HEADから2つ前とdiff
	dt3 = difftool HEAD~~~          # HEADから3つ前とdiff
	dt4 = difftool HEAD~~~~         # HEADから4つ前とdiff
	dt5 = difftool HEAD~~~~~        # HEADから5つ前とdiff
	dt10 = difftool HEAD~~~~~~~~~~  # HEADから10前とdiff
	d1 = diff HEAD~            # HEADから1つ前とdiff
	d2 = diff HEAD~~           # HEADから2つ前とdiff
	d3 = diff HEAD~~~          # HEADから3つ前とdiff
	d4 = diff HEAD~~~~         # HEADから4つ前とdiff
	d5 = diff HEAD~~~~~        # HEADから5つ前とdiff
	d10 = diff HEAD~~~~~~~~~~  # HEADから10前とdiff

	edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `f`"
	add-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
	gr = grep
	gn = grep -n
[difftool "sourcetree"]
	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
	path = 
[mergetool "sourcetree"]
	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
	trustExitCode = true