Yeah, sometimes you forget, sometimes you get a new machine and forgot to version control your settings. I’ve hear it happens to people. :-)
Config
[user]
email = fredrik@wendt.se
name = Fredrik Wendt
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$REMOTE" "$LOCAL"
[merge]
tool = meld
[mergetool "meld"]
cmd = meld "$REMOTE" "$MERGED" "$LOCAL" --output "$MERGED"
[push]
default = simple
[alias]
st = status
tree = log --graph --decorate --pretty=oneline --abbrev-commit
lol = log --graph --oneline --decorate
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
unstage = reset --
[core]
autocrlf = input
excludesfile = /home/ceda/.gitignore
[pull]
rebase = true
[url "git@github.com:"]
insteadOf = https://github.com/
[log]
date = iso
And some nice commands:
$ git difftool -d master..mystuff
$ git checkout master
$ git merge mybranch
$ meld . # launches the directory view of the merge conflict