Commit 93b64fca authored by Emma Jane's avatar Emma Jane

Adding sample git config file.

parent 7caf8358
name = Your Name
email = Your Email
default = simple
# settings from rupl
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = green
changed = yellow
untracked = red
st = status
cm = commit
br = branch
co = checkout
df = diff
dc = diff --cached
ds = diff --staged
dn = diff --numstat
dns = diff --staged --numstat
lg = log -p
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
lolp = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
ls = ls-files
rhh = reset --hard HEAD
# Show files ignored by git:
ign = clean -dXn
# Oneline, but with author and date
log-date = log --pretty=format:'%C(yellow)%h %Cred%ad %Cblue%an%Cgreen%d %Creset%s' --date=short
autocorrect = 1
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
tool = Kaleidoscope
prompt = false
prompt = false
tool = Kaleidoscope
editor = /usr/bin/vim
helper = osxkeychain
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment