Skip to content

Instantly share code, notes, and snippets.

@alex-berezan
Created October 30, 2013 18:17
Show Gist options
  • Save alex-berezan/7237393 to your computer and use it in GitHub Desktop.
Save alex-berezan/7237393 to your computer and use it in GitHub Desktop.
my gitconfig
[user]
name = Aleksey Berezan
email = aleksey.berezan@gmail.com
[core]
editor = notepad
autocrlf = true
excludesfile = ~/.gitignore
ignorecase = true
[alias]
co = checkout
br = branch
cm = commit
mt = mergetool
st = status
df = difftool
h = log --graph --pretty=format:'%Cred%h%Creset %Cgreen%ar%Creset %C(yellow)%d%Creset %s %C(green)<%an>%Creset' --abbrev-commit
diffex = !git diff > C:/temp/temp.diff | start notepad C:/temp/temp.diff
diffex-c = !git diff --cached > C:/temp/temp.diff | start notepad C:/temp/temp.diff
diffex-all = !git diff HEAD > C:/temp/temp.diff | start st C:/temp/temp.diff
short-log = log --pretty=format:'%h: %s'
update = "!git fetch;git pull --rebase"
cobr = checkout -b
stepback = reset HEAD^
outgoing=!git fetch && git log --abbrev-commit FETCH_HEAD..master
incoming=!git fetch && git log --abbrev-commit master..FETCH_HEAD
out=!git fetch && git log --abbrev-commit --pretty=oneline FETCH_HEAD..master
in=!git fetch && git log --abbrev-commit --pretty=oneline master..FETCH_HEAD
cdiff = diff --color-words
outp = !git fetch && git log --abbrev-commit --pretty=oneline public/master..master
mergec = "! git merge $1 && git br -d $2"
[diff]
tool = bc3
guitool = beyondcompare3
[difftool "bc3"]
path = c:/program files (x86)/beyond compare 3/bcomp.exe
cmd = \"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
[merge]
tool = bc3
[mergetool "bc3"]
path = c:/program files (x86)/beyond compare 3/bcomp.exe
cmd = \"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true
[difftool]
prompt = false
[credential]
helper = !\"C:/Program Files (x86)/GitExtensions/GitCredentialWinStore/git-credential-winstore.exe\"
[difftool "beyondcompare3"]
path = C:/Program Files (x86)/Beyond Compare 3/bcomp.exe
cmd = \"C:/Program Files (x86)/Beyond Compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
[mergetool]
keepBackup = false
[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = true
pager = true
[color "status"]
added = green bold
changed = red bold
untracked = yellow bold
[color "branch"]
remote = yellow
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment