Skip to content

Instantly share code, notes, and snippets.

@nibocn
Created February 9, 2015 08:32
Show Gist options
  • Save nibocn/69dadcd28e6535a48c78 to your computer and use it in GitHub Desktop.
Save nibocn/69dadcd28e6535a48c78 to your computer and use it in GitHub Desktop.
[core]
        quotepath = false
        editor = vim
        fileMode = false
[color]
        ui = always
[user]
        

[alias]
        st = status
        ci = commit
        co = checkout
        br = branch
        lgg = log --color --date-order --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit --
        lg = log --color --decorate --date-order --graph --date=iso
        lgf = log --color --decorate --date-order --graph --date=iso --stat
        lgp = log --color --decorate --date-order --graph --date=iso --pretty=raw
        lgpf = log --color --decorate --date-order --graph --date=iso --pretty=raw --stat
        lgfs = log --color --decorate --date-order --graph --date=iso --name-status
        unstage = "reset HEAD --"
        ps = push
        pl = pull
        ft = fetch
        dfc = diff --cached
        df = diff

[diff]
        tool = bc3
[difftool "bc3"]
        cmd = \"/e/Software/BeyondCompare3/BCompare.exe\" \"$(cygpath -w $LOCAL)\" \"$(cygpath -w $REMOTE)\"
[merge]
        tool = bc3
[mergetool]
        prompt = false
[mergetool "bc3"]
        cmd = \"/e/Software/BeyondCompare3/BCompare.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\" \"$MERGED\"

[difftool]
        prompt = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment