localhots/dotfiles
1
0
Fork 0
Code Releases Activity

Updated git config

Browse Source
This commit is contained in:
Gregory Eremin 2014-08-08 18:08:55 +07:00
parent 56c33d2645
commit 2d236dee7a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git/gitconfig
View File

@ -2,7 +2,8 @@
protocol = https protocol = https
[user] [user]
name = Gregory Eremin name = Gregory Eremin
email = magnolia_fan@me.com email = g@erem.in
signingkey = EC26E86C
[credential] [credential]
helper = osxkeychain helper = osxkeychain
[alias] [alias]
@ -12,8 +13,10 @@
ci = commit ci = commit
rd = rebase -i development rd = rebase -i development
rh = rebase -i HEAD~5 rh = rebase -i HEAD~5
cp = cherry-pick
unstage = reset unstage = reset
undo = reset --soft HEAD^ undo = reset --soft HEAD^
reword = git commit --amend -m
[color] [color]
diff = auto diff = auto
status = auto status = auto
@ -34,7 +37,7 @@
[help] [help]
autocorrect = 1 autocorrect = 1
[achievement] [achievement]
upload = true upload = true
[difftool "Kaleidoscope"] [difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff] [diff]
@ -44,3 +47,6 @@
trustExitCode = true trustExitCode = true
[merge] [merge]
tool = Kaleidoscope tool = Kaleidoscope
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f